Added support for dynamic image sources