I think this problem will go away when we have one DataFrame for each layer.