Additional changes made to Contact and Address classes