Added helpers and fixed some authorization issues