DefineQ changes