Probably best to go the mixin approach like you suggest. Could you please take care of this one? Need to get some rest for a morning meeting.