Add 5min and 15min support.
Cleanup.