Issue #454 - Add verification for the data sent to the end point