Further separating concerns of Picture