Options class added