new changes, more options
Updated with GoogleAppEngine Structure