added unmapped parameters to the method and code cleanup