Avoid class variables and streamline credentials method