[*] Constructor changed