added class to manage options