Divided data into mapper and collection
Fixed phpdoc