Improved the angular support.