Implemented new validation model