Added dynamic image support