Changes required for ModQ

#wip