A method of enabling functionality at a User Plane Function, UPF, by a Session Management Function, SMF, in a telecommunication network. The method includes receiving, by the UPF, a session creation/modification message for creating/modifying a session between the UPF and the SMF, wherein the session creation/modification message includes a session functionality indication for indicating functionality to be enabled for said session, and enabling, by the UPF, the functionality during the session between said UPF and the SMF.