Added support for addon components when user is in a  non-standard OU