Added timer feature and made one breaking change to the so-called feature 'api'