Workaround cyclic dependencies