Fixes #13 Redesign collections & map impl to match the one used in CQL3