Moved velocity out of the PropertySet, see #88