pulled mark's schema - adding changes to updated schema models and migration