Updated models to fit new architecture for DB