Added coordinate mapping