Moved container type definition where it belongs.