Updated to fit GAE project