Upgrade Query and Criteria for Serialize