Add square sample support