Streamlined building the mapping stages