Changed post queries to support latest classes Id