Added validation for presence