Added some authentication stuffs...