Start making changes to support full PropertyName passing, not just String name