added generic options