Move watch memory allocation code into initializator