Moved from lib directory to models dir