Change calling convention for only and mapping methods