Moved to model file