improve watch imports