Added contact information class, tweaked relationships