Reformat API + Protocol