Made the setter models more OE independent so we can move them to util
at some point when they are stable