Start with introducing support for module options