Added input arguments to the classes.
Revert "Added input arguments to the classes."

This reverts commit dbd22d5d0193fff20968079853ca3c3745c93206.