Externalize criteria group storage