Added basic correspondence functionality