Improved snapshot usability.