4 commits relating to mapping entities or fists