Event namespace and option work

Event namespace work and making sure options were merged and available in all plugins