Adding entries documentation
Fixing tests, adding new methods