adding additional keys etc; supporting mirror URLs more formally