Updated reference datahandler