Added base functionality with GAE