Updated constructor calls, created Criteria