Added new mapper structure