Refactor validation presence