Added non-assigned entries and fixed cc lookup