Added logic for User