Add new feature for testing sp migration