Modulise and add more options