Refactored models to new dbsession pattern, updated Singleton class