Moving optiosn to its own file