Adding mapping and parser