Make it work with different options