Feature/provisioning enforcer

fix + additions