Better for Plugins

Issue by #43 

PLEASE DO NOT MERGE THIS BRANCH.