Migrated solutions to new API