Reduce container complexity