ImageManagerImpl improvements