First pass at migration to 1.2 API