Migrated functionality to different scripts