Use new layout and logger support in Saft