Add watch schema creator