Add watchr support