Updated class diagram (fixes #13), added simple metrics