Cleaned up domain objects