Keep track when properties belong to proxy properties

This way when we need to reorder the proxy property, we can also move down all the properties that "belong" to it.