Subscript Handler Updated