Added layout-by-name support