Still working on credentials loading