Some improved support for data based images