Added TimeBucket as a concept