Hawk 0.10 api rewrite