Added TODOs in EnlistService