Added frontend mapping