Classes updated and optimized for both options. Different output names used in analyzer code!