Added more class's declarations; unstable commit.