Enhanced the mock builder - Started linking the visitor results for building sth usefull