improved provisioning. Simpler structure