Better credentials configuration