Added efficient picture management