Added custom treatment for Maps so we have an extra helper method for the builder