Feature/go instant and maps