Better organization of plugin options