Added more dynamic image loading