Try to support watch capabilities