Re-formatting of DB entity and model