Roll back protected Mapper methods
Sami config tweaks