Related data constraint fixes

Didn't find any model related data which extends Helper mixins...