- Added all required functionalities