Updated NClass and implementation files