Added first calls to if-data module and some clean up.