Interim fix for cyclic dependency