Change this to methods, to make the plugin more consistent