Follow handler API change