added gmaps field
made some fields optional