completed some refactoring and added lazy loading of Organization Info and User Info