Add friendly messages support in code - needs to be added though in layouts.