Changes for validation included