Restructuring input class to handle additional variables