improve init/watch sequence to allow nested collection