added snapshot support to be a bit more future proof