Reworked Timey integration