Revision and extension of the HF-CC method