Added support for usage sync