Move parsing to endpoint