Support for collectables was addaded