build maps before instead of passing null