More property choice

More property choice