Small changes. Ready for making class diagram.