refactor model descriptors