Constructor changed