Adding/Fix classes constructors to make them correspond