Component container refracctorings