Added some more configurable properties