JavaDoc update and class diagram added