Replaced constructor definition