Common class and normalizing data added #24