Added a wealth of functionality