Fix Constructor of classes