Added new class and renamed some variables and classes