Changed mq to be class based.