Fix to locations
Update base generator for id