Add support for 1.12 and new layout