Add next watch and next alarm support