Status handling + Authorization fix