Improved layouts/configuration/deployment descriptors