Updates for app engine