Updated Class, moved key to config