Adding validation constraints