added explicit mapping