Changed stuff for easier access to plugins