small refactor of gem-data-class