Use independant model, changes to orm mapper for database