Refactor collection cotainer type.