enhance data parse