diff --git a/core/src/main/java/org/bitcoinj/core/FullPrunedBlockChain.java b/core/src/main/java/org/bitcoinj/core/FullPrunedBlockChain.java
index e7b0a822..be5ac276 100644
--- a/core/src/main/java/org/bitcoinj/core/FullPrunedBlockChain.java
+++ b/core/src/main/java/org/bitcoinj/core/FullPrunedBlockChain.java
@@ -44,10 +44,12 @@ import static com.google.common.base.Preconditions.checkState;
  * serve the full block chain to other clients, but it nevertheless provides the same security guarantees as a regular
  * Satoshi client does.</p>
  */
-public class FullPrunedBlockChain extends AbstractBlockChain {    
+public class FullPrunedBlockChain extends AbstractBlockChain {
     private static final Logger log = LoggerFactory.getLogger(FullPrunedBlockChain.class);
-    
-    /** Keeps a map of block hashes to StoredBlocks. */
+
+    /**
+     * Keeps a map of block hashes to StoredBlocks.
+     */
     protected final FullPrunedBlockStore blockStore;
 
     // Whether or not to execute scriptPubKeys before accepting a transaction (i.e. check signatures).
@@ -70,12 +72,16 @@ public class FullPrunedBlockChain extends AbstractBlockChain {
         this(Context.getOrCreate(params), wallet, blockStore);
     }
 
-    /** Constructs a block chain connected to the given store. */
+    /**
+     * Constructs a block chain connected to the given store.
+     */
     public FullPrunedBlockChain(Context context, FullPrunedBlockStore blockStore) throws BlockStoreException {
         this(context, new ArrayList<BlockChainListener>(), blockStore);
     }
 
-    /** See {@link #FullPrunedBlockChain(Context, Wallet, FullPrunedBlockStore)} */
+    /**
+     * See {@link #FullPrunedBlockChain(Context, Wallet, FullPrunedBlockStore)}
+     */
     public FullPrunedBlockChain(NetworkParameters params, FullPrunedBlockStore blockStore) throws BlockStoreException {
         this(Context.getOrCreate(params), blockStore);
     }
@@ -90,7 +96,9 @@ public class FullPrunedBlockChain extends AbstractBlockChain {
         this.chainHead = blockStore.getVerifiedChainHead();
     }
 
-    /** See {@link #FullPrunedBlockChain(Context, List, FullPrunedBlockStore)} */
+    /**
+     * See {@link #FullPrunedBlockChain(Context, List, FullPrunedBlockStore)}
+     */
     public FullPrunedBlockChain(NetworkParameters params, List<BlockChainListener> listeners,
                                 FullPrunedBlockStore blockStore) throws BlockStoreException {
         this(Context.getOrCreate(params), listeners, blockStore);
@@ -103,7 +111,7 @@ public class FullPrunedBlockChain extends AbstractBlockChain {
         blockStore.put(newBlock, new StoredUndoableBlock(newBlock.getHeader().getHash(), txOutChanges));
         return newBlock;
     }
-    
+
     @Override
     protected StoredBlock addToBlockStore(StoredBlock storedPrev, Block block)
             throws BlockStoreException, VerificationException {
@@ -132,27 +140,31 @@ public class FullPrunedBlockChain extends AbstractBlockChain {
     public void setRunScripts(boolean value) {
         this.runScripts = value;
     }
-    
-    //TODO: Remove lots of duplicated code in the two connectTransactions
-    
+
+    // TODO: Remove lots of duplicated code in the two connectTransactions
+
     // TODO: execute in order of largest transaction (by input count) first
     ExecutorService scriptVerificationExecutor = Executors.newFixedThreadPool(
             Runtime.getRuntime().availableProcessors(), new ContextPropagatingThreadFactory("Script verification"));
 
-    /** A job submitted to the executor which verifies signatures. */
+    /**
+     * A job submitted to the executor which verifies signatures.
+     */
     private static class Verifier implements Callable<VerificationException> {
         final Transaction tx;
         final List<Script> prevOutScripts;
         final Set<VerifyFlag> verifyFlags;
 
         public Verifier(final Transaction tx, final List<Script> prevOutScripts, final Set<VerifyFlag> verifyFlags) {
-            this.tx = tx; this.prevOutScripts = prevOutScripts; this.verifyFlags = verifyFlags;
+            this.tx = tx;
+            this.prevOutScripts = prevOutScripts;
+            this.verifyFlags = verifyFlags;
         }
 
         @Nullable
         @Override
         public VerificationException call() throws Exception {
-            try{
+            try {
                 ListIterator<Script> prevOutIt = prevOutScripts.listIterator();
                 for (int index = 0; index < tx.getInputs().size(); index++) {
                     tx.getInputs().get(index).getScriptSig().correctlySpends(tx, index, prevOutIt.next(), verifyFlags);
@@ -164,18 +176,20 @@ public class FullPrunedBlockChain extends AbstractBlockChain {
         }
     }
 
-    /** Get the {@link Script} from the script bytes or null if it doesn't parse. */
-    @Nullable
+    /**
+     * Get the {@link Script} from the script bytes or null if it doesn't parse.
+     */
     private Script getScript(byte[] scriptBytes) {
         try {
             return new Script(scriptBytes);
         } catch (Exception e) {
-            return null;
+            return new Script(new byte[0]);
         }
     }
 
     /**
      * Get the address from the {@link Script} if it exists otherwise return empty string "".
+     *
      * @param script The script.
      * @return The address.
      */
@@ -190,18 +204,6 @@ public class FullPrunedBlockChain extends AbstractBlockChain {
         return address;
     }
 
-    /**
-     * Get the {@link Script.ScriptType} of this script.
-     * @param script The script.
-     * @return The script type.
-     */
-    private Script.ScriptType getScriptType(@Nullable Script script) {
-        if (script != null) {
-            return script.getScriptType();
-        }
-        return Script.ScriptType.NO_TYPE;
-    }
-
     @Override
     protected TransactionOutputChanges connectTransactions(int height, Block block)
             throws VerificationException, BlockStoreException {
@@ -222,7 +224,7 @@ public class FullPrunedBlockChain extends AbstractBlockChain {
 
         if (scriptVerificationExecutor.isShutdown())
             scriptVerificationExecutor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
-        
+
         List<Future<VerificationException>> listScriptVerificationResults = new ArrayList<Future<VerificationException>>(block.transactions.size());
         try {
             if (!params.isCheckpoint(height)) {
@@ -252,7 +254,7 @@ public class FullPrunedBlockChain extends AbstractBlockChain {
                     for (int index = 0; index < tx.getInputs().size(); index++) {
                         TransactionInput in = tx.getInputs().get(index);
                         UTXO prevOut = blockStore.getTransactionOutput(in.getOutpoint().getHash(),
-                                                                                          in.getOutpoint().getIndex());
+                                in.getOutpoint().getIndex());
                         if (prevOut == null)
                             throw new VerificationException("Attempted to spend a non-existent or already spent output!");
                         // Coinbases can't be spent until they mature, to avoid re-orgs destroying entire transaction
@@ -266,16 +268,13 @@ public class FullPrunedBlockChain extends AbstractBlockChain {
                         // TODO: Check we're not spending the genesis transaction here. Satoshis code won't allow it.
                         valueIn = valueIn.add(prevOut.getValue());
                         if (verifyFlags.contains(VerifyFlag.P2SH)) {
-                            if (new Script(prevOut.getScriptBytes()).isPayToScriptHash())
+                            if (prevOut.getScript().isPayToScriptHash())
                                 sigOps += Script.getP2SHSigOpCount(in.getScriptBytes());
                             if (sigOps > Block.MAX_BLOCK_SIGOPS)
                                 throw new VerificationException("Too many P2SH SigOps in block");
                         }
-                        
-                        prevOutScripts.add(new Script(prevOut.getScriptBytes()));
-                        
-                        //in.getScriptSig().correctlySpends(tx, index, new Script(params, prevOut.getScriptBytes(), 0, prevOut.getScriptBytes().length));
-                        
+
+                        prevOutScripts.add(prevOut.getScript());
                         blockStore.removeUnspentTransactionOutput(prevOut);
                         txOutsSpent.add(prevOut);
                     }
@@ -289,9 +288,8 @@ public class FullPrunedBlockChain extends AbstractBlockChain {
                             out.getIndex(),
                             out.getValue(),
                             height, isCoinBase,
-                            out.getScriptBytes(),
-                            getScriptAddress(script),
-                            getScriptType(script).ordinal());
+                            script,
+                            getScriptAddress(script));
                     blockStore.addUnspentTransactionOutput(newOut);
                     txOutsCreated.add(newOut);
                 }
@@ -306,7 +304,7 @@ public class FullPrunedBlockChain extends AbstractBlockChain {
                         throw new VerificationException("Transaction input value out of range");
                     totalFees = totalFees.add(valueIn.subtract(valueOut));
                 }
-                
+
                 if (!isCoinBase && runScripts) {
                     // Because correctlySpends modifies transactions, this must come after we are done with tx
                     FutureTask<VerificationException> future = new FutureTask<VerificationException>(new Verifier(tx, prevOutScripts, verifyFlags));
@@ -350,7 +348,7 @@ public class FullPrunedBlockChain extends AbstractBlockChain {
         checkState(lock.isHeldByCurrentThread());
         if (!params.passesCheckpoint(newBlock.getHeight(), newBlock.getHeader().getHash()))
             throw new VerificationException("Block failed checkpoint lockin at " + newBlock.getHeight());
-        
+
         blockStore.beginDatabaseBatchWrite();
         StoredUndoableBlock block = blockStore.getUndoBlock(newBlock.getHeader().getHash());
         if (block == null) {
@@ -369,7 +367,7 @@ public class FullPrunedBlockChain extends AbstractBlockChain {
                 if (newBlock.getHeader().getTimeSeconds() >= NetworkParameters.BIP16_ENFORCE_TIME)
                     verifyFlags.add(VerifyFlag.P2SH);
                 if (!params.isCheckpoint(newBlock.getHeight())) {
-                    for(Transaction tx : transactions) {
+                    for (Transaction tx : transactions) {
                         Sha256Hash hash = tx.getHash();
                         if (blockStore.hasUnspentOutputs(hash, tx.getOutputs().size()))
                             throw new VerificationException("Block failed BIP30 test!");
@@ -377,11 +375,11 @@ public class FullPrunedBlockChain extends AbstractBlockChain {
                 }
                 Coin totalFees = Coin.ZERO;
                 Coin coinbaseValue = null;
-                
+
                 if (scriptVerificationExecutor.isShutdown())
                     scriptVerificationExecutor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
                 List<Future<VerificationException>> listScriptVerificationResults = new ArrayList<Future<VerificationException>>(transactions.size());
-                for(final Transaction tx : transactions) {
+                for (final Transaction tx : transactions) {
                     boolean isCoinBase = tx.isCoinBase();
                     Coin valueIn = Coin.ZERO;
                     Coin valueOut = Coin.ZERO;
@@ -390,22 +388,21 @@ public class FullPrunedBlockChain extends AbstractBlockChain {
                         for (int index = 0; index < tx.getInputs().size(); index++) {
                             final TransactionInput in = tx.getInputs().get(index);
                             final UTXO prevOut = blockStore.getTransactionOutput(in.getOutpoint().getHash(),
-                                                                                                    in.getOutpoint().getIndex());
+                                    in.getOutpoint().getIndex());
                             if (prevOut == null)
                                 throw new VerificationException("Attempted spend of a non-existent or already spent output!");
                             if (prevOut.isCoinbase() && newBlock.getHeight() - prevOut.getHeight() < params.getSpendableCoinbaseDepth())
                                 throw new VerificationException("Tried to spend coinbase at depth " + (newBlock.getHeight() - prevOut.getHeight()));
                             valueIn = valueIn.add(prevOut.getValue());
                             if (verifyFlags.contains(VerifyFlag.P2SH)) {
-                                Script script = new Script(prevOut.getScriptBytes());
-                                if (script.isPayToScriptHash())
+                                if (prevOut.getScript().isPayToScriptHash())
                                     sigOps += Script.getP2SHSigOpCount(in.getScriptBytes());
                                 if (sigOps > Block.MAX_BLOCK_SIGOPS)
                                     throw new VerificationException("Too many P2SH SigOps in block");
                             }
-                            
-                            prevOutScripts.add(new Script(prevOut.getScriptBytes()));
-                            
+
+                            prevOutScripts.add(prevOut.getScript());
+
                             blockStore.removeUnspentTransactionOutput(prevOut);
                             txOutsSpent.add(prevOut);
                         }
@@ -419,9 +416,8 @@ public class FullPrunedBlockChain extends AbstractBlockChain {
                                 out.getValue(),
                                 newBlock.getHeight(),
                                 isCoinBase,
-                                out.getScriptBytes(),
-                                getScriptAddress(script),
-                                getScriptType(script).ordinal());
+                                script,
+                                getScriptAddress(script));
                         blockStore.addUnspentTransactionOutput(newOut);
                         txOutsCreated.add(newOut);
                     }
@@ -436,7 +432,7 @@ public class FullPrunedBlockChain extends AbstractBlockChain {
                             throw new VerificationException("Transaction input value out of range");
                         totalFees = totalFees.add(valueIn.subtract(valueOut));
                     }
-                    
+
                     if (!isCoinBase) {
                         // Because correctlySpends modifies transactions, this must come after we are done with tx
                         FutureTask<VerificationException> future = new FutureTask<VerificationException>(new Verifier(tx, prevOutScripts, verifyFlags));
@@ -464,7 +460,7 @@ public class FullPrunedBlockChain extends AbstractBlockChain {
             } else {
                 txOutChanges = block.getTxOutChanges();
                 if (!params.isCheckpoint(newBlock.getHeight()))
-                    for(UTXO out : txOutChanges.txOutsCreated) {
+                    for (UTXO out : txOutChanges.txOutsCreated) {
                         Sha256Hash hash = out.getHash();
                         if (blockStore.getTransactionOutput(hash, out.getIndex()) != null)
                             throw new VerificationException("Block failed BIP30 test!");
@@ -485,7 +481,7 @@ public class FullPrunedBlockChain extends AbstractBlockChain {
         }
         return txOutChanges;
     }
-    
+
     /**
      * This is broken for blocks that do not pass BIP30, so all BIP30-failing blocks which are allowed to fail BIP30
      * must be checkpointed.
@@ -498,9 +494,9 @@ public class FullPrunedBlockChain extends AbstractBlockChain {
             StoredUndoableBlock undoBlock = blockStore.getUndoBlock(oldBlock.getHeader().getHash());
             if (undoBlock == null) throw new PrunedException(oldBlock.getHeader().getHash());
             TransactionOutputChanges txOutChanges = undoBlock.getTxOutChanges();
-            for(UTXO out : txOutChanges.txOutsSpent)
+            for (UTXO out : txOutChanges.txOutsSpent)
                 blockStore.addUnspentTransactionOutput(out);
-            for(UTXO out : txOutChanges.txOutsCreated)
+            for (UTXO out : txOutChanges.txOutsCreated)
                 blockStore.removeUnspentTransactionOutput(out);
         } catch (PrunedException e) {
             blockStore.abortDatabaseBatchWrite();
diff --git a/core/src/main/java/org/bitcoinj/core/UTXO.java b/core/src/main/java/org/bitcoinj/core/UTXO.java
index f8332972..b2b00854 100644
--- a/core/src/main/java/org/bitcoinj/core/UTXO.java
+++ b/core/src/main/java/org/bitcoinj/core/UTXO.java
@@ -1,12 +1,12 @@
 /**
  * Copyright 2012 Matt Corallo.
- *
+ * <p/>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,6 +16,7 @@
 
 package org.bitcoinj.core;
 
+import org.bitcoinj.script.Script;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -36,7 +37,7 @@ public class UTXO implements Serializable {
      *  this output.
      */
     private Coin value;
-    private byte[] scriptBytes;
+    private Script script;
 
     /** Hash of the transaction to which we refer. */
     private Sha256Hash hash;
@@ -48,8 +49,6 @@ public class UTXO implements Serializable {
     private boolean coinbase;
     /** The address of this output */
     private String address;
-    /** The type of this address */
-    private int addressType;
 
     /**
      * Creates a stored transaction output.
@@ -58,22 +57,20 @@ public class UTXO implements Serializable {
      * @param value The value available.
      * @param height The height this output was created in.
      * @param coinbase The coinbase flag.
-     * @param scriptBytes The script bytes.
      */
     public UTXO(Sha256Hash hash,
                 long index,
                 Coin value,
                 int height,
                 boolean coinbase,
-                byte[] scriptBytes) {
+                Script script) {
         this.hash = hash;
         this.index = index;
         this.value = value;
         this.height = height;
-        this.scriptBytes = scriptBytes;
+        this.script = script;
         this.coinbase = coinbase;
         this.address = "";
-        this.addressType = 0;
     }
 
     /**
@@ -83,21 +80,17 @@ public class UTXO implements Serializable {
      * @param value The value available.
      * @param height The height this output was created in.
      * @param coinbase The coinbase flag.
-     * @param scriptBytes The script bytes.
      * @param address The address.
-     * @param addressType The address type.
      */
     public UTXO(Sha256Hash hash,
                 long index,
                 Coin value,
                 int height,
                 boolean coinbase,
-                byte[] scriptBytes,
-                String address,
-                int addressType) {
-        this(hash, index, value, height, coinbase, scriptBytes);
+                Script script,
+                String address) {
+        this(hash, index, value, height, coinbase, script);
         this.address = address;
-        this.addressType = addressType;
     }
 
     public UTXO(InputStream in) throws IOException {
@@ -110,9 +103,10 @@ public class UTXO implements Serializable {
                 ((in.read() & 0xFF) << 8) |
                 ((in.read() & 0xFF) << 16) |
                 ((in.read() & 0xFF) << 24);
-        scriptBytes = new byte[scriptBytesLength];
+        byte[] scriptBytes = new byte[scriptBytesLength];
         if (in.read(scriptBytes) != scriptBytesLength)
             throw new EOFException();
+        script = new Script(scriptBytes);
 
         byte[] hashBytes = new byte[32];
         if (in.read(hashBytes) != 32)
@@ -147,11 +141,11 @@ public class UTXO implements Serializable {
     }
 
     /**
-     * The backing script bytes which can be turned into a Script object.
-     * @return the scriptBytes.
+     * The Script object which you can use to get address, script bytes or script type.
+     * @return the script.
      */
-    public byte[] getScriptBytes() {
-        return scriptBytes;
+    public Script getScript() {
+        return script;
     }
 
     /**
@@ -191,15 +185,7 @@ public class UTXO implements Serializable {
      * @return The address.
      */
     public String getAddress() {
-       return address;
-    }
-
-    /**
-     * The type of the address.
-     * @return The address type.
-     */
-    public int getAddressType() {
-        return addressType;
+        return address;
     }
 
     @Override
@@ -209,7 +195,7 @@ public class UTXO implements Serializable {
 
     @Override
     public int hashCode() {
-        return hash.hashCode() + (int)index;
+        return hash.hashCode() + (int) index;
     }
 
     @Override
@@ -224,6 +210,7 @@ public class UTXO implements Serializable {
     public void serializeToStream(OutputStream bos) throws IOException {
         Utils.uint64ToByteStreamLE(BigInteger.valueOf(value.value), bos);
 
+        byte[] scriptBytes = script.getProgram();
         bos.write(0xFF & scriptBytes.length >> 0);
         bos.write(0xFF & scriptBytes.length >> 8);
         bos.write(0xFF & (scriptBytes.length >> 16));
@@ -239,7 +226,7 @@ public class UTXO implements Serializable {
         bos.write(0xFF & (height >> 24));
 
         byte[] coinbaseByte = new byte[1];
-        if(coinbase) {
+        if (coinbase) {
             coinbaseByte[0] = 1;
         } else {
             coinbaseByte[0] = 0;
diff --git a/core/src/main/java/org/bitcoinj/core/Wallet.java b/core/src/main/java/org/bitcoinj/core/Wallet.java
index ed0a95f4..cb7d1b86 100644
--- a/core/src/main/java/org/bitcoinj/core/Wallet.java
+++ b/core/src/main/java/org/bitcoinj/core/Wallet.java
@@ -4006,7 +4006,7 @@ public class Wallet extends BaseTaggableObject implements Serializable, BlockCha
          * @param output The stored output (free standing).
          */
         public FreeStandingTransactionOutput(NetworkParameters params, UTXO output, int chainHeight) {
-            super(params, null, output.getValue(), output.getScriptBytes());
+            super(params, null, output.getValue(), output.getScript().getProgram());
             this.output = output;
             this.chainHeight = chainHeight;
         }
diff --git a/core/src/main/java/org/bitcoinj/store/DatabaseFullPrunedBlockStore.java b/core/src/main/java/org/bitcoinj/store/DatabaseFullPrunedBlockStore.java
index e2b918f0..35dd1733 100644
--- a/core/src/main/java/org/bitcoinj/store/DatabaseFullPrunedBlockStore.java
+++ b/core/src/main/java/org/bitcoinj/store/DatabaseFullPrunedBlockStore.java
@@ -19,6 +19,7 @@ package org.bitcoinj.store;
 
 import com.google.common.collect.Lists;
 import org.bitcoinj.core.*;
+import org.bitcoinj.script.Script;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -929,15 +930,13 @@ public abstract class DatabaseFullPrunedBlockStore implements FullPrunedBlockSto
             byte[] scriptBytes = results.getBytes(3);
             boolean coinbase = results.getBoolean(4);
             String address = results.getString(5);
-            int addressType = results.getInt(6);
             UTXO txout = new UTXO(hash,
                     index,
                     value,
                     height,
                     coinbase,
-                    scriptBytes,
-                    address,
-                    addressType);
+                    new Script(scriptBytes),
+                    address);
             return txout;
         } catch (SQLException ex) {
             throw new BlockStoreException(ex);
@@ -963,9 +962,9 @@ public abstract class DatabaseFullPrunedBlockStore implements FullPrunedBlockSto
             s.setInt(2, (int) out.getIndex());
             s.setInt(3, out.getHeight());
             s.setLong(4, out.getValue().value);
-            s.setBytes(5, out.getScriptBytes());
+            s.setBytes(5, out.getScript().getProgram());
             s.setString(6, out.getAddress());
-            s.setInt(7, out.getAddressType());
+            s.setInt(7, out.getScript().getScriptType().ordinal());
             s.setBoolean(8, out.isCoinbase());
             s.executeUpdate();
             s.close();
@@ -1173,15 +1172,13 @@ public abstract class DatabaseFullPrunedBlockStore implements FullPrunedBlockSto
                     int index = rs.getInt(5);
                     boolean coinbase = rs.getBoolean(6);
                     String toAddress = rs.getString(7);
-                    int addressType = rs.getInt(8);
                     UTXO output = new UTXO(hash,
                             index,
                             amount,
                             height,
                             coinbase,
-                            scriptBytes,
-                            toAddress,
-                            addressType);
+                            new Script(scriptBytes),
+                            toAddress);
                     outputs.add(output);
                 }
             }