Moved parser into api views