model refactoring - rest + mobile