Added debugging info and mapping