add IndexPropertHandler support, no test