Replacing some hard coded class names with configurable classes object