Workaround for circular depenency problem