Refactor room version definitions.