Move raptor add-ons into sub-property