Removed final from Query