Don't break now when working with more restrictive editabling host container
Minor refactoring