Updated to v1 of the Core API

@stevesherrie please review.

@tejohnso FYI