Updated classes to use ConfigTrait and updated interface