Fixed dependency on identity manager