Version(0.0.0.6)Support for single item maps + tests