Added new functionalities and features

Added new functionalities and features