Moved options framework to plugin