Refactor validations for addons