added additional properties to user swagger model
moved shared util functions to utils