Fixed explicit mapping and added explicit recognizer