Make it work with choices/suggestions on properties