Add a support for indexed property handler