add gae functionality