Updated to support output to exe