added default type container, fixed circular dependency error