Add quiver.maps and quiver.base with pair functionality