Refactor; add input maps as dependencies