added Options class functionality