Added Second and Minute period bucketers. Need to refactor