Added local image support