Moved to constructor model for server