In one-way quantum computations (1WQC), quantum correlations in an entangled state, called a cluster or graph state, are exploited to perform universal quantum computations using single-qubit measurements. The choices of bases for these measurements as well as the structure of the entanglements specify a quantum algorithm. The needed computations in this model are organized as patterns. Previously, an approach to extract a 1WQC pattern from a quantum circuit was proposed. The approach takes a quantum circuit consisting of only CZ andj(oc) gates and translates it into a 1WQC pattern after performing some known optimizations. However, most quantum synthesis algorithms decompose circuits using a library containing CNOT and any single-qubit gates. In this paper, we show how this approach can be modified in a way that it can take a circuit consisting of CNOT and any single-qubit gates as well as CZ and J(oc) gates to produce a 1WQC pattern. Experimental results show that adding CNOT gate directly to the pattern decreases the translation run-time.