Adds support for multiple keychains