Fix up models for single db