Completed Lambda, adding new Static Map to solve the typing issue.