Migrated to using the 1.4 API