Data model updates
User data and domain layers