Refactored in support for input parameter mapping.