Move options to a special module