Update data layer code to simplify implementation of both message and data objects.