Minor updates to API; add utilities