Add validation logic with helper method