V5 Added containers and removed scaffolding