Added some startup stuffs