sml: make use of new enumeration class in model
patches: add fix borked concepts