Updated to instantiate classes instead