Adding a few methods
Merge branch 'dev-map' into dev-fak
refactor unitchain to use Map