Updated data methods to use Message