Switch options over to a static class