database rejig - models modified