Moved image creation to Boundary object