Updates API conventions
Adds throw statement parsing