Fixed the fact of changing the constructor and breacking backwards compatibility