Updated consumer and photo class