Changed how we handle the properties. Let's see if this proves to be better.