Basics for timewindows + Switch to new API