added layout-generator annotations