Optimalisation in the Picture class (less access to the datastore)