Refactor build mappings.