Constructor modified