Enhanced functionalities