ImageManagerImpl improvement