Small fix
Class defs populate fields and predicates