These changes will be reverted as the DIFx framework won't help me out