Porkodi changes - all validations