Remove circular dependency on patient resource