On the second I think it would be better to move this property somewhere under `self` module that basically is an `env`  for the add-on. We should try to not increase dependencies on `@loader/options` as it's just a hack and will be problematic for users of modules that are not an add-ons.