Added the next time field. The clash in class names is still an issue.