Updated to support custom user profiles.