Workaround for circular dependency problem