Added support for togglz