Revise to work with changes with IDATBuilder