Added support for Rectangle and Count type.