refactor validation for flat entities
refactor incoming liberator resource for new validation