Added snapshot version support