Add more options for module support