add map + work on builder