Patch to work with latest code bypassing dependecies problems