Simplified mapping using default values
Updated migration bundle