Cleaned up property/binder implementation