Extracted options to a separate class