Modified Container to have flat class structure instead of hierarchical