Added support for generating ActiveQuery classes