changes to support custom user