Change to use async image loading