Added class topics, etc