User manual and class diagrams updated