Structure changed for google app engine