got rid of type parameters for dataRecord
added Enhancers