Add join feature for simple collections and maps. Refactor code for entity scanning
Documentation update