Added ActiveQuery decorator