refactoring rts_datamodel