Migrate type to use scope