Reworked mapping, a couple stub units