Added some external stuff