Added support for many other stuff