Changed metric to metric snapshot
Fixed dependencies for metric snapshot and renamed its subclasses