Support for more degrees