Fixes: #2169 Improved snapshot handling, cleaned plugin