more updates to handle rci addons