Added some custom Property stuff