Adjusted models to fit with legacy DB