Revert "Deleted Duplicate class"

This reverts commit 86607b262f19268f75ebf7984b14cef3dbd414d3.