Updated with more auth info