add Activity Class & fix Common Class