add changes for typeDataFast