Added support for all remaining features