Updated models to fit new architecture for DB
Updated models to fit new architecture for DB