It is confusing that one has to edit heat_transfer.xml to use DATASPACES. Can we get rid of that requirement?