small changes
Making necessary classes