moved some more functions to the plugin classes, as they are only used with plugin's