Constructors fix and XText validation