Added factory class for options