Enhancing JSWAT For Monitor-based Executions