Added dataBinaryCodec, and formatting for the rest