added watchroom fixture
refactored the mapping creation and document indexing