Refactor decorator mechanism for indexed properties