Added following functionality for users