Updated classes and contact