Updated documentations

Closes #1584