Feature/container modifier