Removed the buckets pass-through static
Better mapping between Value instances and dates for moment