Added core functionalities