Generated custom query for @key directive, doesn't return custom non-model types within data model

Generated custom query for @key directive, doesn't return custom non-model types within data model #11