Added rest of functionality for users