Moving more to Moose, more plugins