changed map types to hybrid