move generic options into separate class