Refactoring arguments map

Best effort implementation of the arguments map.