More work migrating to TokenImageManager