separating extra credentials from original credentials to keep backward compatibility