Fixed Calling Mapping Generator