Migrate to new toolkit framework