#450 Added various validation constrains