Refactor of credentials / more specs