Better credentials storage