UPDATE: Refactor container generation