add manal data format support along with other code enhancement