More self-reference cases added