Added staves and refactored PropRenderer and PropFactory.