diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
index 06d6273b7..40969ecd8 100644
--- a/.github/workflows/github-actions.yml
+++ b/.github/workflows/github-actions.yml
@@ -19,6 +19,8 @@ jobs:
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
       # Setup node environment for testing
       - uses: actions/setup-node@v2
         with:
diff --git a/README.md b/README.md
index 061c3f045..fd2e4b1ea 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ source setup_tracker_gcp.sh
 - Start tracker server job
 ```
 cd ain-blockchain/
-sh start_tracker_gcp.sh
+sh start_tracker_genesis_gcp.sh
 ```
 
 <!--
@@ -136,7 +136,7 @@ source setup_node_gcp.sh
 ```
 - Start Node server job (set shard index to 0 if you're running a root chain node)
 ```
-sh start_node_gcp.sh {dev|spring|summer} <SHARD_INDEX> <SERVER_INDEX>
+sh start_node_genesis_gcp.sh {dev|spring|summer} <SHARD_INDEX> <SERVER_INDEX>
 ```
 
 <!--
diff --git a/blockchain/block.js b/blockchain/block.js
index 8765e4ee5..7515dd7f3 100644
--- a/blockchain/block.js
+++ b/blockchain/block.js
@@ -129,8 +129,20 @@ class Block {
           `[${LOG_HEADER}] Last votes or last_votes_hash is incorrect for block ${block.hash}`);
       return false;
     }
-    logger.info(
-        `[${LOG_HEADER}] Hash check successfully done for block: ${block.number} / ${block.epoch}`);
+    return true;
+  }
+
+  static validateValidators(validators) {
+    if (!CommonUtil.isDict(validators)) return false;
+    for (const [address, info] of Object.entries(validators)) {
+      if (!CommonUtil.isCksumAddr(address)) {
+        return false;
+      }
+      if (!CommonUtil.isDict(info) || !CommonUtil.isNumber(info[PredefinedDbPaths.STAKE]) ||
+          !CommonUtil.isBool(info[PredefinedDbPaths.PROPOSAL_RIGHT])) {
+        return false;
+      }
+    }
     return true;
   }
 
@@ -157,6 +169,12 @@ class Block {
       }
       nonceTracker[tx.address] = tx.tx_body.nonce;
     }
+    if (!Block.validateValidators(block.validators)) {
+      logger.error(
+          `[${LOG_HEADER}] Invalid validators format: ${JSON.stringify(block.validators)} ` +
+          `(${block.number} / ${block.epoch})`);
+      return false;
+    }
 
     logger.info(`[${LOG_HEADER}] Validated block: ${block.number} / ${block.epoch}`);
     return true;
@@ -261,7 +279,7 @@ class Block {
 
   static buildGenesisStakingTxs(timestamp) {
     const txs = [];
-    Object.entries(GENESIS_VALIDATORS).forEach(([address, amount], index) => {
+    Object.entries(GENESIS_VALIDATORS).forEach(([address, info], index) => {
       const privateKey = _.get(GenesisAccounts,
           `${AccountProperties.OTHERS}.${index}.${AccountProperties.PRIVATE_KEY}`);
       if (!privateKey) {
@@ -274,7 +292,7 @@ class Block {
         operation: {
           type: 'SET_VALUE',
           ref: PathUtil.getStakingStakeRecordValuePath(PredefinedDbPaths.CONSENSUS, address, 0, timestamp),
-          value: amount
+          value: info[PredefinedDbPaths.STAKE]
         }
       };
       txs.push(Transaction.fromTxBody(txBody, privateKey));
@@ -303,7 +321,7 @@ class Block {
     tempGenesisDb.initDbStates();
     const resList = [];
     for (const tx of genesisTxs) {
-      const res = tempGenesisDb.executeTransaction(Transaction.toExecutable(tx));
+      const res = tempGenesisDb.executeTransaction(Transaction.toExecutable(tx), true);
       if (CommonUtil.isFailedTx(res)) {
         logger.error(`Genesis transaction failed:\n${JSON.stringify(tx, null, 2)}` +
             `\nRESULT: ${JSON.stringify(res)}`)
diff --git a/blockchain/index.js b/blockchain/index.js
index 2292f5aac..cab6bd567 100644
--- a/blockchain/index.js
+++ b/blockchain/index.js
@@ -1,4 +1,3 @@
-const rimraf = require('rimraf');
 const path = require('path');
 const fs = require('fs');
 const logger = require('../logger')('BLOCKCHAIN');
@@ -6,10 +5,10 @@ const { Block } = require('./block');
 const FileUtil = require('../common/file-util');
 const {
   CHAINS_DIR,
-  CHAINS_N2B_DIR_NAME,
+  CHAIN_SEGMENT_LENGTH,
+  ON_MEMORY_CHAIN_LENGTH,
 } = require('../common/constants');
-const CHAIN_SEGMENT_LENGTH = 20;
-const ON_MEM_CHAIN_LENGTH = 20;
+const CommonUtil = require('../common/common-util');
 
 class Blockchain {
   constructor(basePath) {
@@ -19,25 +18,28 @@ class Blockchain {
     this.initSnapshotBlockNumber = -1;
   }
 
+  /**
+   * Initializes the blockchain and returns whether there are block files to load.
+   */
   init(isFirstNode, latestSnapshotBlockNumber) {
-    let lastBlockWithoutProposal;
     this.initSnapshotBlockNumber = latestSnapshotBlockNumber;
-    if (FileUtil.createBlockchainDir(this.blockchainPath)) {
+    const wasBlockDirEmpty = FileUtil.createBlockchainDir(this.blockchainPath);
+    let isGenesisStart = false;
+    if (wasBlockDirEmpty) {
       if (isFirstNode) {
         logger.info('\n');
         logger.info('############################################################');
         logger.info('## Starting FIRST-NODE blockchain with a GENESIS block... ##');
         logger.info('############################################################');
         logger.info('\n');
-        this.chain.push(Block.genesis());
-        this.writeChain();
+        this.writeBlock(Block.genesis());
+        isGenesisStart = true;
       } else {
         logger.info('\n');
         logger.info('#############################################################');
         logger.info('## Starting NON-FIRST-NODE blockchain with EMPTY blocks... ##');
         logger.info('#############################################################');
         logger.info('\n');
-        this.writeChain();
       }
     } else {
       if (isFirstNode) {
@@ -53,24 +55,11 @@ class Blockchain {
         logger.info('################################################################');
         logger.info('\n');
       }
-      const newChain = this.loadChain(latestSnapshotBlockNumber);
-      if (newChain) {
-        // NOTE(minsulee2): Deal with the case the only genesis block was generated.
-        if (newChain.length > 1) {
-          lastBlockWithoutProposal = newChain.pop();
-          const lastBlockPath = FileUtil.getBlockPath(
-              this.blockchainPath, lastBlockWithoutProposal.number);
-          fs.unlinkSync(lastBlockPath);
-        }
-        this.chain = newChain;
-      }
     }
-    if (!this.getBlockByNumber(0)) {
-      const genesisBlock = Block.genesis();
-      FileUtil.writeBlock(this.blockchainPath, genesisBlock);
-      FileUtil.writeHashToNumber(this.blockchainPath, genesisBlock.hash, genesisBlock.number);
-    }
-    return lastBlockWithoutProposal;
+    return {
+      wasBlockDirEmpty,
+      isGenesisStart,
+    };
   }
 
   /**
@@ -83,7 +72,7 @@ class Blockchain {
   getBlockByHash(hash) {
     if (!hash) return null;
     const blockPath = FileUtil.getBlockPath(this.blockchainPath,
-        FileUtil.readHashToNumber(this.blockchainPath, hash));
+        FileUtil.readH2nFile(this.blockchainPath, hash));
     if (!blockPath) {
       return this.chain.find((block) => block.hash === hash);
     } else {
@@ -99,9 +88,11 @@ class Blockchain {
     */
   getBlockByNumber(number) {
     if (number === undefined || number === null) return null;
-    const blockPath = FileUtil.getBlockPath(this.blockchainPath, number);
-    if (!blockPath || number > this.lastBlockNumber() - ON_MEM_CHAIN_LENGTH) {
-      return this.chain.find((block) => block.number === number);
+    const blockNumber = CommonUtil.toNumberOrNaN(number);
+    if (!CommonUtil.isNumber(blockNumber)) return null;
+    const blockPath = FileUtil.getBlockPath(this.blockchainPath, blockNumber);
+    if (!blockPath || blockNumber > this.lastBlockNumber() - ON_MEMORY_CHAIN_LENGTH) {
+      return this.chain.find((block) => block.number === blockNumber);
     } else {
       return Block.parse(FileUtil.readCompressedJson(blockPath));
     }
@@ -141,6 +132,13 @@ class Blockchain {
     return lastBlock.timestamp;
   }
 
+  addBlockToChain(block) {
+    const LOG_HEADER = 'addBlockToChain';
+
+    this.chain.push(block);
+    logger.info(`[${LOG_HEADER}] Successfully added block ${block.number} to chain.`);
+  }
+
   addNewBlockToChain(newBlock) {
     const LOG_HEADER = 'addNewBlockToChain';
 
@@ -155,56 +153,66 @@ class Blockchain {
     if (!(newBlock instanceof Block)) {
       newBlock = Block.parse(newBlock);
     }
-    this.chain.push(newBlock);
-    this.writeChain();
-    // Keep up to latest ON_MEM_CHAIN_LENGTH blocks
-    while (this.chain.length > ON_MEM_CHAIN_LENGTH) {
+    this.addBlockToChain(newBlock);
+    this.writeBlock(newBlock);
+    // Keep up to latest ON_MEMORY_CHAIN_LENGTH blocks
+    while (this.chain.length > ON_MEMORY_CHAIN_LENGTH) {
       this.chain.shift();
     }
     return true;
   }
 
-  static isValidChain(chain, latestSnapshotBlockNumber) {
-    if (!chain.length) {
-      return true;
-    }
-    const firstBlock = Block.parse(chain[0]);
-    if (!firstBlock) {
+  static validateBlock(block, prevBlockNumber = null, prevBlockHash = null) {
+    const LOG_HEADER = 'validateBlock';
+
+    if (prevBlockNumber != null && block.number !== prevBlockNumber + 1) {
+      logger.error(`Invalid block number (expected: ${prevBlockNumber}) of block: ${block.number}`);
       return false;
     }
-    if (latestSnapshotBlockNumber > 0 && latestSnapshotBlockNumber + 1 !== firstBlock.number) {
-      logger.error(`Missing blocks between ${latestSnapshotBlockNumber + 1} and ${firstBlock.number}`);
+    if (prevBlockHash !== null && block.last_hash !== prevBlockHash) {
+      logger.error(
+          `Invalid block last_hash (expected: ${prevBlockHash}) of block: ${block.last_hash}`);
       return false;
     }
-    if (firstBlock.number === 0 && firstBlock.hash !== Block.genesis().hash) {
-      logger.error(`Invalid genesis block: ${firstBlock}\n${Block.genesis()}`);
+    if (!Block.validateHashes(block)) {
+      logger.error(`Invalid block hashes of block: ${block.number}`);
       return false;
     }
-    return Blockchain.isValidChainSegment(chain);
+    logger.info(`[${LOG_HEADER}] Successfully validated block: ${block.number} / ${block.epoch}`);
+    return true;
   }
 
-  static isValidChainSegment(chainSegment) {
-    if (chainSegment.length) {
-      if (!Block.validateHashes(chainSegment[0])) {
+
+  static validateChainSegment(chainSegment) {
+    let prevBlockNumber;
+    let prevBlockHash;
+    if (chainSegment.length > 0) {
+      const block = chainSegment[0];
+      if (!Blockchain.validateBlock(block)) {
         return false;
       }
+      prevBlockNumber = block.number;
+      prevBlockHash = block.hash;
     }
     for (let i = 1; i < chainSegment.length; i++) {
       const block = chainSegment[i];
-      const lastBlock = Block.parse(chainSegment[i - 1]);
-      if (block.last_hash !== lastBlock.hash || !Block.validateHashes(block)) {
+      if (!Blockchain.validateBlock(block, prevBlockNumber, prevBlockHash)) {
         return false;
       }
+      prevBlockNumber = block.number;
+      prevBlockHash = block.hash;
     }
     return true;
   }
 
-  writeChain() {
-    for (let i = 0; i < this.chain.length; i++) {
-      const block = this.chain[i];
-      FileUtil.writeBlock(this.blockchainPath, block);
-      FileUtil.writeHashToNumber(this.blockchainPath, block.hash, block.number);
-    }
+  writeBlock(block) {
+    FileUtil.writeBlockFile(this.blockchainPath, block);
+    FileUtil.writeH2nFile(this.blockchainPath, block.hash, block.number);
+  }
+
+  deleteBlock(block) {
+    FileUtil.deleteBlockFile(this.blockchainPath, block.number);
+    FileUtil.deleteH2nFile(this.blockchainPath, block.hash);
   }
 
   getValidBlocksInChainSegment(chainSegment) {
@@ -231,7 +239,7 @@ class Blockchain {
         return validBlocks;
       }
     }
-    if (!Blockchain.isValidChainSegment(chainSegment)) {
+    if (!Blockchain.validateChainSegment(chainSegment)) {
       logger.error(`Invalid chain segment`);
       return validBlocks;
     }
@@ -244,38 +252,24 @@ class Blockchain {
     return validBlocks;
   }
 
-  /**
-   * Reads the block files at the chains n2b directory and returns a list of blocks starting from
-   * the latestSnapshotBlockNumber + 1.
-   * @param {Number} latestSnapshotBlockNumber
-   * @returns {list} A list of Blocks
-   */
-  loadChain(latestSnapshotBlockNumber) {
-    const chainPath = this.blockchainPath;
-    const newChain = [];
-    const numBlockFiles = fs.readdirSync(path.join(chainPath, CHAINS_N2B_DIR_NAME)).length;
-    const blockPaths = FileUtil.getBlockPaths(chainPath, latestSnapshotBlockNumber + 1, numBlockFiles);
-
-    blockPaths.forEach((blockPath) => {
-      const block = Block.parse(FileUtil.readCompressedJson(blockPath));
-      newChain.push(block);
-    });
+  getNumBlockFiles() {
+    return FileUtil.getNumBlockFiles(this.blockchainPath);
+  }
 
-    if (Blockchain.isValidChain(newChain, latestSnapshotBlockNumber)) {
-      logger.info(`Valid chain of size ${newChain.length}`);
-      return newChain;
+  loadBlock(blockNumber) {
+    const blockPath = FileUtil.getBlockPath(this.blockchainPath, blockNumber);
+    if (!fs.existsSync(blockPath)) {
+      return null;
     }
-    logger.error(`Invalid chain`);
-    rimraf.sync(chainPath + '/*');
-    return null;
+    return Block.parse(FileUtil.readCompressedJson(blockPath));
   }
 
   /**
     * Returns a section of the chain up to a maximuim of length CHAIN_SEGMENT_LENGTH, starting from
-    * the `from` block number up till `to` block number.
+    * the `from` block number (included) up till `to` block number (excluded).
     *
-    * @param {Number} from - The lowest block number to get
-    * @param {Number} to - The highest block number to geet
+    * @param {Number} from - The lowest block number to get (included)
+    * @param {Number} to - The highest block number to geet (excluded)
     * @return {list} A list of Blocks, up to a maximuim length of CHAIN_SEGMENT_LENGTH
     */
   getBlockList(from, to) {
@@ -298,7 +292,7 @@ class Blockchain {
     if (to - from > CHAIN_SEGMENT_LENGTH) { // NOTE: To prevent large query.
       to = from + CHAIN_SEGMENT_LENGTH;
     }
-    const blockPaths = FileUtil.getBlockPaths(this.blockchainPath, from, to - from);
+    const blockPaths = FileUtil.getBlockPathList(this.blockchainPath, from, to - from);
     blockPaths.forEach((blockPath) => {
       blockList.push(Block.parse(FileUtil.readCompressedJson(blockPath)));
     });
diff --git a/client/index.js b/client/index.js
index 1339bcd1f..ccaa4ce08 100755
--- a/client/index.js
+++ b/client/index.js
@@ -15,7 +15,7 @@ const {
   PORT,
   BlockchainNodeStates,
   WriteDbOperations,
-  TransactionStates,
+  PredefinedDbPaths,
 } = require('../common/constants');
 const { ConsensusStates } = require('../consensus/constants');
 
@@ -77,8 +77,7 @@ app.get('/metrics', (req, res, next) => {
 });
 
 app.get('/get_value', (req, res, next) => {
-  const result = node.db.getValue(req.query.ref, CommonUtil.toBool(req.query.is_shallow),
-      CommonUtil.toBool(req.query.is_global));
+  const result = node.db.getValue(req.query.ref, CommonUtil.toGetOptions(req.query));
   res.status(200)
     .set('Content-Type', 'application/json')
     .send({code: result !== null ? 0 : 1, result})
@@ -86,8 +85,7 @@ app.get('/get_value', (req, res, next) => {
 });
 
 app.get('/get_function', (req, res, next) => {
-  const result = node.db.getFunction(req.query.ref, CommonUtil.toBool(req.query.is_shallow),
-      CommonUtil.toBool(req.query.is_global));
+  const result = node.db.getFunction(req.query.ref, CommonUtil.toGetOptions(req.query));
   res.status(200)
     .set('Content-Type', 'application/json')
     .send({code: result !== null ? 0 : 1, result})
@@ -95,8 +93,7 @@ app.get('/get_function', (req, res, next) => {
 });
 
 app.get('/get_rule', (req, res, next) => {
-  const result = node.db.getRule(req.query.ref, CommonUtil.toBool(req.query.is_shallow),
-      CommonUtil.toBool(req.query.is_global));
+  const result = node.db.getRule(req.query.ref, CommonUtil.toGetOptions(req.query));
   res.status(200)
     .set('Content-Type', 'application/json')
     .send({code: result !== null ? 0 : 1, result})
@@ -104,8 +101,7 @@ app.get('/get_rule', (req, res, next) => {
 });
 
 app.get('/get_owner', (req, res, next) => {
-  const result = node.db.getOwner(req.query.ref, CommonUtil.toBool(req.query.is_shallow),
-      CommonUtil.toBool(req.query.is_global));
+  const result = node.db.getOwner(req.query.ref, CommonUtil.toGetOptions(req.query));
   res.status(200)
     .set('Content-Type', 'application/json')
     .send({code: result !== null ? 0 : 1, result})
@@ -134,8 +130,19 @@ app.get('/get_state_info', (req, res, next) => {
     .end();
 });
 
+/**
+ * Returns the state usage of the given app.
+ */
+ app.get('/get_state_usage', (req, res, next) => {
+  const result = node.getStateUsage(req.query.app_name);
+  res.status(200)
+    .set('Content-Type', 'application/json')
+    .send({code: result !== null ? 0 : 1, result})
+    .end();
+});
+
 app.get('/match_function', (req, res, next) => {
-  const result = node.db.matchFunction(req.query.ref, CommonUtil.toBool(req.query.is_global));
+  const result = node.db.matchFunction(req.query.ref, CommonUtil.toMatchOrEvalOptions(req.query));
   res.status(200)
     .set('Content-Type', 'application/json')
     .send({code: result !== null ? 0 : 1, result})
@@ -143,7 +150,7 @@ app.get('/match_function', (req, res, next) => {
 });
 
 app.get('/match_rule', (req, res, next) => {
-  const result = node.db.matchRule(req.query.ref, CommonUtil.toBool(req.query.is_global));
+  const result = node.db.matchRule(req.query.ref, CommonUtil.toMatchOrEvalOptions(req.query));
   res.status(200)
     .set('Content-Type', 'application/json')
     .send({code: result !== null ? 0 : 1, result})
@@ -151,7 +158,7 @@ app.get('/match_rule', (req, res, next) => {
 });
 
 app.get('/match_owner', (req, res, next) => {
-  const result = node.db.matchOwner(req.query.ref, CommonUtil.toBool(req.query.is_global));
+  const result = node.db.matchOwner(req.query.ref, CommonUtil.toMatchOrEvalOptions(req.query));
   res.status(200)
     .set('Content-Type', 'application/json')
     .send({code: result !== null ? 0 : 1, result})
@@ -169,7 +176,7 @@ app.post('/eval_rule', (req, res, next) => {
   }
   const result = node.db.evalRule(
       body.ref, body.value, auth, body.timestamp || Date.now(),
-      CommonUtil.toBool(body.is_global));
+      CommonUtil.toMatchOrEvalOptions(body));
   res.status(200)
     .set('Content-Type', 'application/json')
     .send({code: 0, result})
@@ -186,7 +193,7 @@ app.post('/eval_owner', (req, res, next) => {
     auth.fid = body.fid;
   }
   const result = node.db.evalOwner(
-      body.ref, body.permission, auth, CommonUtil.toBool(body.is_global));
+      body.ref, body.permission, auth, CommonUtil.toMatchOrEvalOptions(body));
   res.status(200)
     .set('Content-Type', 'application/json')
     .send({code: 0, result})
@@ -374,8 +381,8 @@ app.get('/state_versions', (req, res) => {
 });
 
 // TODO(platfowner): Support for subtree dumping (i.e. with ref path).
-app.get('/dump_final_version', (req, res) => {
-  const result = node.dumpFinalVersion(true);
+app.get('/dump_final_db_states', (req, res) => {
+  const result = node.dumpFinalDbStates(CommonUtil.toGetOptions(req.query));
   res.status(200)
     .set('Content-Type', 'application/json')
     .send({code: 0, result})
@@ -392,29 +399,29 @@ app.get('/tx_pool_size_util', (req, res) => {
 });
 
 app.get('/get_transaction', (req, res, next) => {
-  const transactionInfo = node.tp.transactionTracker[req.query.hash];
-  if (transactionInfo) {
-    if (transactionInfo.state === TransactionStates.IN_BLOCK) {
-      const block = node.bc.getBlockByNumber(transactionInfo.number);
-      const index = transactionInfo.index;
-      if (!block) {
-        logger.debug(`No block found for the tx: ${req.query.hash}`);
-      } else if (index >= 0) {
-        transactionInfo.transaction = block.transactions[index];
-      } else {
-        transactionInfo.transaction = _.find(block.last_votes, (tx) => tx.hash === req.query.hash);
-      }
-    } else if (transactionInfo.state === TransactionStates.IN_POOL) {
-      const address = transactionInfo.address;
-      transactionInfo.transaction = _.find(node.tp.transactions[address], (tx) => tx.hash === req.query.hash);
-    }
-  }
+  const transactionInfo = node.getTransactionByHash(req.query.hash);
   res.status(200)
     .set('Content-Type', 'application/json')
     .send({code: 0, result: transactionInfo})
     .end();
 });
 
+app.get('/get_block_by_hash', (req, res, next) => {
+  const block = node.bc.getBlockByHash(req.query.hash);
+  res.status(200)
+    .set('Content-Type', 'application/json')
+    .send({code: 0, result: block})
+    .end();
+});
+
+app.get('/get_block_by_number', (req, res, next) => {
+  const block = node.bc.getBlockByNumber(req.query.number);
+  res.status(200)
+    .set('Content-Type', 'application/json')
+    .send({code: 0, result: block})
+    .end();
+});
+
 app.get('/get_address', (req, res, next) => {
   const result = node.account.address;
   res.status(200)
@@ -431,6 +438,14 @@ app.get('/get_nonce', (req, res, next) => {
     .end();
 });
 
+app.get('/get_timestamp', (req, res, next) => {
+  const result = node.getTimestampForAddr(req.query.address, req.query.from === 'pending');
+  res.status(200)
+    .set('Content-Type', 'application/json')
+    .send({code: 0, result})
+    .end();
+});
+
 app.get('/get_sharding', (req, res, next) => {
   const result = node.getSharding();
   res.status(200)
diff --git a/client/protocol_versions.json b/client/protocol_versions.json
index 04c99efd3..495988914 100644
--- a/client/protocol_versions.json
+++ b/client/protocol_versions.json
@@ -24,30 +24,42 @@
     "max": "0.6"
   },
   "0.7.0": {
-    "min": "0.7.0"
+    "min": "0.7.0",
+    "max": "0.8"
   },
   "0.7.1": {
-    "min": "0.7.0"
+    "min": "0.7.0",
+    "max": "0.8"
   },
   "0.7.2": {
-    "min": "0.7.0"
+    "min": "0.7.0",
+    "max": "0.8"
   },
   "0.7.3": {
-    "min": "0.7.0"
+    "min": "0.7.0",
+    "max": "0.8"
   },
   "0.7.4": {
-    "min": "0.7.0"
+    "min": "0.7.0",
+    "max": "0.8"
   },
   "0.7.5": {
-    "min": "0.7.0"
+    "min": "0.7.0",
+    "max": "0.8"
   },
   "0.7.6": {
-    "min": "0.7.0"
+    "min": "0.7.0",
+    "max": "0.8"
   },
   "0.7.7": {
-    "min": "0.7.0"
+    "min": "0.7.0",
+    "max": "0.8"
   },
   "0.8.0": {
-    "min": "0.7.0"
+    "min": "0.7.0",
+    "max": "0.8"
+  },
+  "0.9.0": {
+    "min": "0.9.0"
   }
 }
\ No newline at end of file
diff --git a/common/common-util.js b/common/common-util.js
index 0d56116e5..c6756e879 100644
--- a/common/common-util.js
+++ b/common/common-util.js
@@ -119,21 +119,25 @@ class CommonUtil {
   }
 
   static boolOrFalse(value) {
-    return CommonUtil.isBool(value) ? value : false;
+    return ruleUtil.boolOrFalse(value);
   }
 
   static numberOrZero(num) {
-    return CommonUtil.isNumber(num) ? num : 0;
+    return ruleUtil.numberOrZero(num);
   }
 
   static stringOrEmpty(str) {
-    return CommonUtil.isString(str) ? str : '';
+    return ruleUtil.stringOrEmpty(str);
   }
 
   static toBool(value) {
     return ruleUtil.toBool(value);
   }
 
+  static toNumberOrNaN(value) {
+    return ruleUtil.toNumberOrNaN(value);
+  }
+
   static toCksumAddr(addr) {
     return ruleUtil.toCksumAddr(addr);
   }
@@ -174,6 +178,42 @@ class CommonUtil {
     }
   }
 
+  static toGetOptions(args) {
+    const options = {};
+    if (args.is_shallow !== undefined) {
+      options.isShallow = CommonUtil.toBool(args.is_shallow);
+    }
+    if (args.is_global !== undefined) {
+      options.isGlobal = CommonUtil.toBool(args.is_global);
+    }
+    if (args.include_tree_info !== undefined) {
+      options.includeTreeInfo = CommonUtil.toBool(args.include_tree_info);
+    }
+    if (args.include_proof !== undefined) {
+      options.includeProof = CommonUtil.toBool(args.include_proof);
+    }
+    if (args.include_version !== undefined) {
+      options.includeVersion = CommonUtil.toBool(args.include_version);
+    }
+    return options;
+  }
+
+  static toMatchOrEvalOptions(args) {
+    const options = {};
+    if (args.is_global !== undefined) {
+      options.isGlobal = CommonUtil.toBool(args.is_global);
+    }
+    return options;
+  }
+
+  static toSetOptions(args) {
+    const options = {};
+    if (args.is_global !== undefined) {
+      options.isGlobal = CommonUtil.toBool(args.is_global);
+    }
+    return options;
+  }
+
   static parseJsonOrNull(str) {
     let parsed = null;
     try {
@@ -239,6 +279,15 @@ class CommonUtil {
     return ref === undefined ? null : ref;
   }
 
+  /**
+   * Sets a value to the given path of an object. If the given path is empty, it tries to copy
+   * the first-level properties of the value to the object.
+   * 
+   * @param {object} obj target object
+   * @param {array} path target path
+   * @param {*} value value to set
+   * @returns true if any changes are done, otherwise false
+   */
   static setJsObject(obj, path, value) {
     if (!CommonUtil.isArray(path)) {
       return false;
@@ -247,7 +296,15 @@ class CommonUtil {
       return false;
     }
     if (path.length === 0) {
-      return false;
+      if (!CommonUtil.isDict(value)) {
+        return false;
+      }
+      for (const key in value) {
+        if (value.hasOwnProperty(key)) {
+          obj[key] = value[key];
+        }
+      }
+      return true;
     }
     let ref = obj;
     for (let i = 0; i < path.length - 1; i++) {
@@ -278,6 +335,17 @@ class CommonUtil {
     return newObj;
   }
 
+  /**
+   * Returns true if the given result is one of the pre-check failure codes.
+   * Includes codes from precheckTxBillingParams(), precheckBalanceAndStakes(),
+   * precheckTransaction(), and executeTransaction() but does not include any codes returned
+   * after executeOperation().
+   */
+  static txPrecheckFailed(result) {
+    const precheckFailureCode = [21, 22, 3, 15, 33, 16, 17, 34, 35];
+    return precheckFailureCode.includes(result.code);
+  }
+
   /**
    * Returns true if the given result is from failed transaction or transaction list.
    */
@@ -285,8 +353,8 @@ class CommonUtil {
     if (!result) {
       return true;
     }
-    if (CommonUtil.isArray(result.result_list)) {
-      for (const subResult of result.result_list) {
+    if (CommonUtil.isDict(result.result_list)) {
+      for (const subResult of Object.values(result.result_list)) {
         if (CommonUtil.isFailedTxResultCode(subResult.code)) {
           return true;
         }
@@ -323,8 +391,8 @@ class CommonUtil {
         if (CommonUtil.isFailedFuncResultCode(funcResult.code)) {
           return true;
         }
-        if (CommonUtil.isArray(funcResult.op_results)) {
-          for (const opResult of funcResult.op_results) {
+        if (!CommonUtil.isEmpty(funcResult.op_results)) {
+          for (const opResult of Object.values(funcResult.op_results)) {
             if (CommonUtil.isFailedTx(opResult.result)) {
               return true;
             }
@@ -349,11 +417,44 @@ class CommonUtil {
     return _.get(parsedPath, 0) === PredefinedDbPaths.APPS;
   }
 
-  // TODO(liayoo): Fix testing paths (writing at the root) and update isServicePath().
-  static isServicePath(parsedPath) {
-    const { isServiceType } = require('../common/constants');
+  static hasServiceOp(op) {
+    if (op.op_list) {
+      for (const innerOp of op.op_list) {
+        if (!CommonUtil.isAppPath(CommonUtil.parsePath(innerOp.ref))) {
+          return true;
+        }
+      }
+      return false;
+    }
+    return !CommonUtil.isAppPath(CommonUtil.parsePath(op.ref));
+  }
+
+  static getAppNameFromRef(ref, shardingPath, isGlobal) {
+    const DB = require('../db');
+    const parsedPath = CommonUtil.parsePath(ref);
+    const localPath = isGlobal === true ? DB.toLocalPath(parsedPath, shardingPath) : parsedPath;
+    if (CommonUtil.isAppPath(localPath)) {
+      return _.get(localPath, 1, null);
+    }
+    return null;
+  }
 
-    return isServiceType(_.get(parsedPath, 0));
+  static getAppNameList(op, shardingPath) {
+    if (!op) {
+      return [];
+    }
+    if (op.op_list) {
+      const appNames = new Set();
+      for (const innerOp of op.op_list) {
+        const name = CommonUtil.getAppNameFromRef(innerOp.ref, shardingPath, innerOp.is_global);
+        if (name) {
+          appNames.add(name);
+        }
+      }
+      return [...appNames];
+    }
+    const name = CommonUtil.getAppNameFromRef(op.ref, shardingPath, op.is_global);
+    return name ? [name] : [];
   }
 
   static getDependentAppNameFromRef(ref) {
@@ -384,51 +485,48 @@ class CommonUtil {
     return name ? [name] : [];
   }
 
-  static getSingleOpGasAmount(parsedPath, value) {
-    const gasAmount = {
-      service: 0,
-      app: {}
-    };
+  static getSingleOpBandwidthGasAmount(parsedPath, value) {
+    const gasAmount = { service: 0 };
     if (!value) {
       return gasAmount;
     }
-    if (CommonUtil.isServicePath(parsedPath)) {
-      CommonUtil.setJsObject(gasAmount, ['service'], value);
-    } else if (CommonUtil.isAppPath(parsedPath)) {
+    if (CommonUtil.isAppPath(parsedPath)) {
       const appName = _.get(parsedPath, 1);
       if (!appName) return;
       CommonUtil.setJsObject(gasAmount, ['app', appName], value);
+    } else {
+      CommonUtil.setJsObject(gasAmount, ['service'], value);
     }
     return gasAmount;
   }
 
-  static getTotalGasAmountInternal(triggeringPath, resultObj) {
-    const gasAmount = {
-      service: 0,
-      app: {}
-    };
+  static getTotalBandwidthGasAmountInternal(triggeringPath, resultObj) {
+    const gasAmount = { service: 0 };
     if (!resultObj) return gasAmount;
     if (resultObj.result_list) return gasAmount; // NOTE: Assume nested SET is not allowed
 
     if (resultObj.func_results) {
       for (const funcRes of Object.values(resultObj.func_results)) {
-        if (CommonUtil.isArray(funcRes.op_results)) {
-          for (const opRes of funcRes.op_results) {
+        if (!CommonUtil.isEmpty(funcRes.op_results)) {
+          for (const opRes of Object.values(funcRes.op_results)) {
             CommonUtil.mergeNumericJsObjects(
               gasAmount,
-              CommonUtil.getTotalGasAmountInternal(CommonUtil.parsePath(opRes.path), opRes.result)
+              CommonUtil.getTotalBandwidthGasAmountInternal(CommonUtil.parsePath(opRes.path), opRes.result)
             );
           }
         }
         // Follow the tx type of the triggering tx.
-        CommonUtil.mergeNumericJsObjects(gasAmount, CommonUtil.getSingleOpGasAmount(triggeringPath, funcRes.gas_amount));
+        CommonUtil.mergeNumericJsObjects(
+          gasAmount,
+          CommonUtil.getSingleOpBandwidthGasAmount(triggeringPath, funcRes.bandwidth_gas_amount)
+        );
       }
     }
 
-    if (resultObj.gas_amount) {
+    if (resultObj.bandwidth_gas_amount) {
       CommonUtil.mergeNumericJsObjects(
         gasAmount,
-        CommonUtil.getSingleOpGasAmount(triggeringPath, resultObj.gas_amount)
+        CommonUtil.getSingleOpBandwidthGasAmount(triggeringPath, resultObj.bandwidth_gas_amount)
       );
     }
 
@@ -439,25 +537,21 @@ class CommonUtil {
    * Returns the total gas amount of the result, separated by the types of operations (service / app)
    * (esp. multi-operation result).
    */
-  static getTotalGasAmount(op, result) {
-    const gasAmount = {
-      service: 0,
-      app: {}
-    };
+  static getTotalBandwidthGasAmount(op, result) {
+    const gasAmount = { service: 0 };
     if (!op || !result) return gasAmount;
     if (result.result_list) {
-      for (let i = 0, len = result.result_list.length; i < len; i++) {
-        const elem = result.result_list[i];
+      for (const [index, res] of Object.entries(result.result_list)) {
         CommonUtil.mergeNumericJsObjects(
           gasAmount,
-          CommonUtil.getTotalGasAmountInternal(CommonUtil.parsePath(op.op_list[i].ref), elem)
+          CommonUtil.getTotalBandwidthGasAmountInternal(CommonUtil.parsePath(op.op_list[index].ref), res)
         );
       }
     } else {
       const triggeringPath = CommonUtil.parsePath(op.ref);
       CommonUtil.mergeNumericJsObjects(
         gasAmount,
-        CommonUtil.getTotalGasAmountInternal(triggeringPath, result)
+        CommonUtil.getTotalBandwidthGasAmountInternal(triggeringPath, result)
       );
     }
 
@@ -486,15 +580,14 @@ class CommonUtil {
   static getServiceGasCostTotalFromTxList(txList, resList) {
     return resList.reduce((acc, cur, index) => {
       const tx = txList[index];
-      const totalGasAmount = CommonUtil.getTotalGasAmount(tx.tx_body.operation, cur);
       return CommonUtil.mergeNumericJsObjects(acc, {
-        gasAmountTotal: totalGasAmount.service,
-        gasCostTotal: CommonUtil.getTotalGasCost(tx.tx_body.gas_price, totalGasAmount.service)
+        gasAmountTotal: cur.gas_amount_charged,
+        gasCostTotal: CommonUtil.getTotalGasCost(tx.tx_body.gas_price, cur.gas_amount_charged)
       });
     }, { gasAmountTotal: 0, gasCostTotal: 0 });
   }
 
-  static returnTxResult(code, message = null, gasAmount = 0, funcResults = null) {
+  static returnTxResult(code, message = null, bandwidthGasAmount = 0, funcResults = null) {
     const result = {};
     if (message) {
       result.error_message = message;
@@ -503,7 +596,7 @@ class CommonUtil {
       result.func_results = funcResults;
     }
     result.code = code;
-    result.gas_amount = gasAmount;
+    result.bandwidth_gas_amount = bandwidthGasAmount;
     return result;
   }
 
@@ -574,15 +667,25 @@ class CommonUtil {
     return CommonUtil.metricsToText(metrics);
   }
 
-  static sleep = (ms) => {
+  static sleep(ms) {
     return new Promise((resolve) => {
       setTimeout(resolve, ms);
     });
   };
 
-  static convertEnvVarInputToBool = (input, defaultValue = false) => {
+  static convertEnvVarInputToBool(input, defaultValue = false) {
     return input ? input.toLowerCase().startsWith('t') : defaultValue;
   }
+
+  static convertListToObj(list) {
+    const obj = {};
+    if (!CommonUtil.isArray(list)) return null;
+    const copyOfList = JSON.parse(JSON.stringify(list));
+    copyOfList.forEach((item, index) => {
+      obj[index] = item;
+    });
+    return obj;
+  }
 }
 
 module.exports = CommonUtil;
diff --git a/common/constants.js b/common/constants.js
index 874595f2c..4094d059d 100644
--- a/common/constants.js
+++ b/common/constants.js
@@ -27,6 +27,8 @@ const FeatureFlags = {
   enableRichP2pCommunicationLogging: false,
   // Enables rich logging for tx selection in tx pool.
   enableRichTxSelectionLogging: false,
+  // Enables receipt path's prefix layers.
+  enableReceiptPathPrefixLayers: true,
 };
 
 // ** Environment variables **
@@ -44,6 +46,8 @@ const PORT = process.env.PORT || getPortNumber(8080, 8080);
 const P2P_PORT = process.env.P2P_PORT || getPortNumber(5000, 5000);
 const LIGHTWEIGHT = CommonUtil.convertEnvVarInputToBool(process.env.LIGHTWEIGHT);
 const SYNC_MODE = process.env.SYNC_MODE || 'full';
+const MAX_BLOCK_NUMBERS_FOR_RECEIPTS = process.env.MAX_BLOCK_NUMBERS_FOR_RECEIPTS ?
+    Number(process.env.MAX_BLOCK_NUMBERS_FOR_RECEIPTS) : 1000;
 
 // ** Constants **
 const CURRENT_PROTOCOL_VERSION = require('../package.json').version;
@@ -69,17 +73,43 @@ if (!fs.existsSync(BLOCKCHAIN_DATA_DIR)) {
   fs.mkdirSync(BLOCKCHAIN_DATA_DIR, { recursive: true });
 }
 const CHAINS_DIR = path.resolve(BLOCKCHAIN_DATA_DIR, 'chains');
-const CHAINS_N2B_DIR_NAME = 'n2b'; // NOTE: Block number to block.
-const CHAINS_H2N_DIR_NAME = 'h2n'; // NOTE: Block hash to block number.
+const CHAINS_N2B_DIR_NAME = 'n2b'; // Number-to-block directory name.
+const CHAINS_H2N_DIR_NAME = 'h2n'; // Hash-to-number directory name.
+const CHAINS_N2B_MAX_NUM_FILES = 100000;
+const CHAINS_H2N_HASH_PREFIX_LENGTH = 5;
+const CHAIN_SEGMENT_LENGTH = 20;
+const ON_MEMORY_CHAIN_LENGTH = 10;
 const SNAPSHOTS_ROOT_DIR = path.resolve(BLOCKCHAIN_DATA_DIR, 'snapshots');
-const SNAPSHOTS_N2S_DIR_NAME = 'n2s'; // NOTE: Block number to snapshot.
-const SNAPSHOTS_INTERVAL_BLOCK_NUMBER = 1000; // NOTE: How often the snapshot is made
-const MAX_NUM_SNAPSHOTS = 10; // NOTE: max number of snapshots to keep
+const SNAPSHOTS_N2S_DIR_NAME = 'n2s'; // Number-to-snapshot directory name.
+// NOTE(platfowner): Should have a value bigger than ON_MEMORY_CHAIN_LENGTH.
+const SNAPSHOTS_INTERVAL_BLOCK_NUMBER = 1000; // How often the snapshot is generated.
+const MAX_NUM_SNAPSHOTS = 10; // Maximum number of snapshots to be kept.
 const HASH_DELIMITER = '#';
 const TX_NONCE_ERROR_CODE = 900;
 const TX_TIMESTAMP_ERROR_CODE = 901;
 const MILLI_AIN = 10**-3; // 1,000 milliain = 1 ain
 const MICRO_AIN = 10**-6; // 1,000,000 microain = 1 ain
+const SERVICE_BANDWIDTH_BUDGET_RATIO = 0.5;
+const APPS_BANDWIDTH_BUDGET_RATIO = 0.45;
+const FREE_BANDWIDTH_BUDGET_RATIO = 0.05;
+const SERVICE_STATE_BUDGET_RATIO = 0.5;
+const APPS_STATE_BUDGET_RATIO = 0.45;
+const FREE_STATE_BUDGET_RATIO = 0.05;
+const bandwidthBudgetPerBlock = GenesisParams.resource.BANDWIDTH_BUDGET_PER_BLOCK;
+const stateTreeBytesLimit = process.env.STATE_TREE_BYTES_LIMIT ?
+    process.env.STATE_TREE_BYTES_LIMIT : GenesisParams.resource.STATE_TREE_BYTES_LIMIT; // = Total state budget
+const SERVICE_BANDWIDTH_BUDGET_PER_BLOCK = bandwidthBudgetPerBlock * SERVICE_BANDWIDTH_BUDGET_RATIO;
+const APPS_BANDWIDTH_BUDGET_PER_BLOCK = bandwidthBudgetPerBlock * APPS_BANDWIDTH_BUDGET_RATIO;
+const FREE_BANDWIDTH_BUDGET_PER_BLOCK = bandwidthBudgetPerBlock * FREE_BANDWIDTH_BUDGET_RATIO;
+const SERVICE_STATE_BUDGET = stateTreeBytesLimit * SERVICE_STATE_BUDGET_RATIO;
+const APPS_STATE_BUDGET = stateTreeBytesLimit * APPS_STATE_BUDGET_RATIO;
+const FREE_STATE_BUDGET = stateTreeBytesLimit * FREE_STATE_BUDGET_RATIO;
+const MAX_STATE_TREE_SIZE_PER_BYTE = 0.005;
+const TREE_SIZE_BUDGET = stateTreeBytesLimit * MAX_STATE_TREE_SIZE_PER_BYTE;
+const SERVICE_TREE_SIZE_BUDGET = SERVICE_STATE_BUDGET * MAX_STATE_TREE_SIZE_PER_BYTE;
+const APPS_TREE_SIZE_BUDGET = APPS_STATE_BUDGET * MAX_STATE_TREE_SIZE_PER_BYTE;
+const FREE_TREE_SIZE_BUDGET = FREE_STATE_BUDGET * MAX_STATE_TREE_SIZE_PER_BYTE;
+const STATE_GAS_COEFFICIENT = 1;
 
 // ** Enums **
 /**
@@ -119,6 +149,11 @@ const PredefinedDbPaths = {
   RULES_ROOT: 'rules',
   FUNCTIONS_ROOT: 'functions',
   VALUES_ROOT: 'values',
+  // Entry point labels (.*)
+  DOT_RULE: '.rule',
+  DOT_FUNCTION: '.function',
+  DOT_OWNER: '.owner',
+  DOT_SHARD: '.shard',
   // Consensus
   CONSENSUS: 'consensus',
   WHITELIST: 'whitelist',
@@ -130,10 +165,19 @@ const PredefinedDbPaths = {
   VOTE: 'vote',
   BLOCK_HASH: 'block_hash',
   STAKE: 'stake',
+  PROPOSAL_RIGHT: 'proposal_right',
+  // Receipts
+  RECEIPTS: 'receipts',
+  RECEIPTS_ADDRESS: 'address',
+  RECEIPTS_BILLING: 'billing',
+  RECEIPTS_BLOCK_NUMBER: 'block_number',
+  RECEIPTS_EXEC_RESULT: 'exec_result',
+  RECEIPTS_GAS_COST_TOTAL: 'gas_cost_total',
   // Gas fee
   GAS_FEE: 'gas_fee',
   COLLECT: 'collect',
   BILLING: 'billing',
+  GAS_FEE_AMOUNT: 'amount',
   // Token
   TOKEN: 'token',
   TOKEN_NAME: 'name',
@@ -159,6 +203,7 @@ const PredefinedDbPaths = {
   MANAGE_APP_CONFIG_ADMIN: 'admin',
   MANAGE_APP_CONFIG_BILLING: 'billing',
   MANAGE_APP_CONFIG_BILLING_USERS: 'users',
+  MANAGE_APP_CONFIG_IS_PUBLIC: 'is_public',
   MANAGE_APP_CONFIG_SERVICE: 'service',
   MANAGE_APP_CREATE: 'create',
   MANAGE_APP_RESULT: 'result',
@@ -234,7 +279,6 @@ const OwnerProperties = {
   ANYONE: '*',
   BRANCH_OWNER: 'branch_owner',
   FID_PREFIX: 'fid:',
-  OWNER: '.owner',
   OWNERS: 'owners',
   WRITE_FUNCTION: 'write_function',
   WRITE_OWNER: 'write_owner',
@@ -247,7 +291,7 @@ const OwnerProperties = {
  * @enum {string}
  */
 const RuleProperties = {
-  WRITE: '.write',
+  WRITE: 'write',
 };
 
 /**
@@ -257,7 +301,6 @@ const RuleProperties = {
  */
 const FunctionProperties = {
   EVENT_LISTENER: 'event_listener',
-  FUNCTION: '.function',
   FUNCTION_ID: 'function_id',
   FUNCTION_TYPE: 'function_type',
   SERVICE_NAME: 'service_name',
@@ -288,8 +331,12 @@ const ProofProperties = {
  * @enum {string}
  */
 const StateInfoProperties = {
+  NUM_PARENTS: 'num_parents',
+  PROOF_HASH: 'proof_hash',
+  VERSION: 'version',
   TREE_HEIGHT: 'tree_height',
   TREE_SIZE: 'tree_size',
+  TREE_BYTES: 'tree_bytes',
 };
 
 /**
@@ -333,7 +380,6 @@ const ShardingProperties = {
   PROOF_HASH: 'proof_hash',
   PROOF_HASH_MAP: 'proof_hash_map',
   REPORTING_PERIOD: 'reporting_period',
-  SHARD: '.shard',
   SHARD_OWNER: 'shard_owner',
   SHARD_REPORTER: 'shard_reporter',
   SHARDING_ENABLED: 'sharding_enabled',
@@ -418,9 +464,10 @@ const FunctionResultCode = {
  */
 const TransactionStates = {
   IN_BLOCK: 'IN_BLOCK',
-  IN_POOL: 'IN_POOL',
+  EXECUTED: 'EXECUTED',
+  FAILED: 'FAILED',
+  PENDING: 'PENDING',
   TIMED_OUT: 'TIMED_OUT',
-  FAILED: 'FAILED'
 };
 
 /**
@@ -469,7 +516,6 @@ const SERVICE_TYPES = [
   PredefinedDbPaths.SHARDING,
   PredefinedDbPaths.STAKING,
   PredefinedDbPaths.TRANSFER,
-  'test',  // NOTE(platfowner): A temporary solution for tests.
 ];
 
 function isServiceType(type) {
@@ -521,7 +567,7 @@ const SyncModeOptions = {
  * (priority: base params < genesis_params.json in GENESIS_CONFIGS_DIR < env var)
  */
 const OVERWRITING_BLOCKCHAIN_PARAMS = ['TRACKER_WS_ADDR', 'HOSTING_ENV'];
-const OVERWRITING_CONSENSUS_PARAMS = ['MIN_NUM_VALIDATORS', 'EPOCH_MS'];
+const OVERWRITING_CONSENSUS_PARAMS = ['MIN_NUM_VALIDATORS', 'MAX_NUM_VALIDATORS', 'EPOCH_MS'];
 
 function overwriteGenesisParams(overwritingParams, type) {
   for (const key of overwritingParams) {
@@ -536,7 +582,10 @@ function overwriteGenesisParams(overwritingParams, type) {
     for (let i = 0; i < GenesisParams.consensus.MIN_NUM_VALIDATORS; i++) {
       const addr = GenesisAccounts[AccountProperties.OTHERS][i][AccountProperties.ADDRESS];
       CommonUtil.setJsObject(whitelist, [addr], true);
-      CommonUtil.setJsObject(validators, [addr], GenesisParams.consensus.MIN_STAKE_PER_VALIDATOR);
+      CommonUtil.setJsObject(validators, [addr], {
+          [PredefinedDbPaths.STAKE]: GenesisParams.consensus.MIN_STAKE_PER_VALIDATOR,
+          [PredefinedDbPaths.PROPOSAL_RIGHT]: true
+        });
     }
     GenesisParams.consensus.GENESIS_WHITELIST = whitelist;
     GenesisParams.consensus.GENESIS_VALIDATORS = validators;
@@ -547,19 +596,19 @@ overwriteGenesisParams(OVERWRITING_BLOCKCHAIN_PARAMS, 'blockchain');
 overwriteGenesisParams(OVERWRITING_CONSENSUS_PARAMS, 'consensus');
 
 // NOTE(minsulee2): If NETWORK_OPTIMIZATION env is set, it tightly limits the outbound connections.
-// The minimum network connections are set based on the MIN_NUM_VALIDATORS otherwise.
+// The minimum network connections are set based on the MAX_NUM_VALIDATORS otherwise.
 function initializeNetworkEnvronments() {
   if (process.env.NETWORK_OPTIMIZATION) {
     return GenesisParams.network;
   } else {
     return {
-      // NOTE(minsulee2): Need a discussion that MIN_NUM_VALIDATORS and MAX_INBOUND_LIMIT
+      // NOTE(minsulee2): Need a discussion that MAX_NUM_VALIDATORS and MAX_INBOUND_LIMIT
       // should not be related to one another.
       P2P_MESSAGE_TIMEOUT_MS: 600000,
-      MAX_OUTBOUND_LIMIT: GenesisParams.consensus.MIN_NUM_VALIDATORS - 1,
-      MAX_INBOUND_LIMIT: GenesisParams.consensus.MIN_NUM_VALIDATORS - 1,
-      DEFAULT_MAX_OUTBOUND: GenesisParams.consensus.MIN_NUM_VALIDATORS - 1,
-      DEFAULT_MAX_INBOUND: GenesisParams.consensus.MIN_NUM_VALIDATORS - 1
+      MAX_OUTBOUND_LIMIT: GenesisParams.consensus.MAX_NUM_VALIDATORS - 1,
+      MAX_INBOUND_LIMIT: GenesisParams.consensus.MAX_NUM_VALIDATORS - 1,
+      DEFAULT_MAX_OUTBOUND: GenesisParams.consensus.MAX_NUM_VALIDATORS - 1,
+      DEFAULT_MAX_INBOUND: GenesisParams.consensus.MAX_NUM_VALIDATORS - 1
     }
   }
 }
@@ -661,7 +710,8 @@ function getGenesisRules() {
 }
 
 function getGenesisOwners() {
-  const owners = getGenesisConfig('genesis_owners.json', process.env.ADDITIONAL_OWNERS);
+  let owners = getGenesisConfig('genesis_owners.json', process.env.ADDITIONAL_OWNERS);
+  CommonUtil.setJsObject(owners, [], getRootOwner());
   if (GenesisSharding[ShardingProperties.SHARDING_PROTOCOL] !== ShardingProtocols.NONE) {
     CommonUtil.setJsObject(
         owners, [PredefinedDbPaths.SHARDING, PredefinedDbPaths.SHARDING_CONFIG],
@@ -676,13 +726,26 @@ function getShardingRule() {
   const ownerAddress =
       CommonUtil.getJsObject(GenesisAccounts, [AccountProperties.OWNER, AccountProperties.ADDRESS]);
   return {
-    [RuleProperties.WRITE]: `auth.addr === '${ownerAddress}'`,
+    [PredefinedDbPaths.DOT_RULE]: {
+      [RuleProperties.WRITE]: `auth.addr === '${ownerAddress}'`,
+    }
+  };
+}
+
+function getRootOwner() {
+  return {
+    [PredefinedDbPaths.DOT_OWNER]: {
+      [OwnerProperties.OWNERS]: {
+        [GenesisAccounts.owner.address]: buildOwnerPermissions(true, true, true, true),
+        [OwnerProperties.ANYONE]: buildOwnerPermissions(false, false, false, false),
+      }
+    }
   };
 }
 
 function getShardingOwner() {
   return {
-    [OwnerProperties.OWNER]: {
+    [PredefinedDbPaths.DOT_OWNER]: {
       [OwnerProperties.OWNERS]: {
         [GenesisAccounts.owner.address]: buildOwnerPermissions(false, true, true, true),
         [OwnerProperties.ANYONE]: buildOwnerPermissions(false, false, false, false),
@@ -693,7 +756,7 @@ function getShardingOwner() {
 
 function getWhitelistOwner() {
   return {
-    [OwnerProperties.OWNER]: {
+    [PredefinedDbPaths.DOT_OWNER]: {
       [OwnerProperties.OWNERS]: {
         [GenesisAccounts.owner.address]: buildOwnerPermissions(false, true, true, true),
         [OwnerProperties.ANYONE]: buildOwnerPermissions(false, false, false, false),
@@ -712,7 +775,11 @@ function buildOwnerPermissions(branchOwner, writeFunction, writeOwner, writeRule
 }
 
 function buildRulePermission(rule) {
-  return { [RuleProperties.WRITE]: rule };
+  return {
+    [PredefinedDbPaths.DOT_RULE]: {
+      [RuleProperties.WRITE]: rule
+    }
+  };
 }
 
 module.exports = {
@@ -725,10 +792,15 @@ module.exports = {
   CHAINS_DIR,
   CHAINS_N2B_DIR_NAME,
   CHAINS_H2N_DIR_NAME,
+  CHAINS_N2B_MAX_NUM_FILES,
+  CHAINS_H2N_HASH_PREFIX_LENGTH,
+  CHAIN_SEGMENT_LENGTH,
+  ON_MEMORY_CHAIN_LENGTH,
   SNAPSHOTS_ROOT_DIR,
   SNAPSHOTS_N2S_DIR_NAME,
   SNAPSHOTS_INTERVAL_BLOCK_NUMBER,
   MAX_NUM_SNAPSHOTS,
+  MAX_BLOCK_NUMBERS_FOR_RECEIPTS,
   DEBUG,
   CONSOLE_LOG,
   ENABLE_DEV_SET_CLIENT_API,
@@ -745,6 +817,17 @@ module.exports = {
   TX_TIMESTAMP_ERROR_CODE,
   MICRO_AIN,
   MILLI_AIN,
+  SERVICE_BANDWIDTH_BUDGET_PER_BLOCK,
+  APPS_BANDWIDTH_BUDGET_PER_BLOCK,
+  FREE_BANDWIDTH_BUDGET_PER_BLOCK,
+  SERVICE_STATE_BUDGET,
+  APPS_STATE_BUDGET,
+  FREE_STATE_BUDGET,
+  TREE_SIZE_BUDGET,
+  SERVICE_TREE_SIZE_BUDGET,
+  APPS_TREE_SIZE_BUDGET,
+  FREE_TREE_SIZE_BUDGET,
+  STATE_GAS_COEFFICIENT,
   MessageTypes,
   BlockchainNodeStates,
   PredefinedDbPaths,
diff --git a/common/file-util.js b/common/file-util.js
index 005947937..7e05de3d7 100644
--- a/common/file-util.js
+++ b/common/file-util.js
@@ -5,6 +5,8 @@ const _ = require('lodash');
 const {
   CHAINS_N2B_DIR_NAME,
   CHAINS_H2N_DIR_NAME,
+  CHAINS_N2B_MAX_NUM_FILES,
+  CHAINS_H2N_HASH_PREFIX_LENGTH,
   SNAPSHOTS_N2S_DIR_NAME,
 } = require('./constants');
 const CommonUtil = require('./common-util');
@@ -12,17 +14,30 @@ const JSON_GZIP_FILE_EXTENSION = 'json.gz';
 const logger = require('../logger')('FILE-UTIL');
 
 class FileUtil {
+  static getBlockDirPath(chainPath, blockNumber) {
+    const n2bPrefix = Math.floor(blockNumber / CHAINS_N2B_MAX_NUM_FILES).toString();
+    return path.join(chainPath, CHAINS_N2B_DIR_NAME, n2bPrefix);
+  }
+
   static getBlockPath(chainPath, blockNumber) {
     if (blockNumber < 0) return null;
-    return path.join(chainPath, CHAINS_N2B_DIR_NAME, this.getBlockFilenameByNumber(blockNumber));
+    return path.join(
+        FileUtil.getBlockDirPath(chainPath, blockNumber),
+        FileUtil.getBlockFilenameByNumber(blockNumber));
   }
 
   static getSnapshotPathByBlockNumber(snapshotPath, blockNumber) {
-    return path.join(snapshotPath, SNAPSHOTS_N2S_DIR_NAME, this.getBlockFilenameByNumber(blockNumber));
+    return path.join(
+        snapshotPath, SNAPSHOTS_N2S_DIR_NAME, FileUtil.getBlockFilenameByNumber(blockNumber));
+  }
+
+  static getH2nDirPath(chainPath, blockHash) {
+    const h2nPrefix = blockHash.substring(0, CHAINS_H2N_HASH_PREFIX_LENGTH);
+    return path.join(chainPath, CHAINS_H2N_DIR_NAME, h2nPrefix);
   }
 
-  static getHashToNumberPath(chainPath, blockHash) {
-    return path.join(chainPath, CHAINS_H2N_DIR_NAME, blockHash);
+  static getH2nPath(chainPath, blockHash) {
+    return path.join(FileUtil.getH2nDirPath(chainPath, blockHash), blockHash);
   }
 
   static getBlockFilenameByNumber(blockNumber) {
@@ -30,7 +45,7 @@ class FileUtil {
   }
 
   static getBlockFilename(block) {
-    return this.getBlockFilenameByNumber(block.number);
+    return FileUtil.getBlockFilenameByNumber(block.number);
   }
 
   static getLatestSnapshotInfo(snapshotPath) {
@@ -54,11 +69,11 @@ class FileUtil {
     return { latestSnapshotPath, latestSnapshotBlockNumber };
   }
 
-  static getBlockPaths(chainPath, from, size) {
+  static getBlockPathList(chainPath, from, size) {
     const blockPaths = [];
     if (size <= 0) return blockPaths;
     for (let number = from; number < from + size; number++) {
-      const blockFile = this.getBlockPath(chainPath, number);
+      const blockFile = FileUtil.getBlockPath(chainPath, number);
       if (fs.existsSync(blockFile)) {
         blockPaths.push(blockFile);
       } else {
@@ -72,24 +87,20 @@ class FileUtil {
   static createBlockchainDir(chainPath) {
     const n2bPath = path.join(chainPath, CHAINS_N2B_DIR_NAME);
     const h2nPath = path.join(chainPath, CHAINS_H2N_DIR_NAME);
-    let isBlockEmpty = true;
-
+    let isBlocksDirEmpty = true;
     if (!fs.existsSync(chainPath)) {
       fs.mkdirSync(chainPath, {recursive: true});
     }
-
     if (!fs.existsSync(n2bPath)) {
       fs.mkdirSync(n2bPath);
     }
-
     if (!fs.existsSync(h2nPath)) {
       fs.mkdirSync(h2nPath);
     }
-
     if (fs.readdirSync(n2bPath).length > 0) {
-      isBlockEmpty = false;
+      isBlocksDirEmpty = false;
     }
-    return isBlockEmpty;
+    return isBlocksDirEmpty;
   }
 
   static createSnapshotDir(snapshotPath) {
@@ -112,14 +123,18 @@ class FileUtil {
   }
 
   static readBlockByNumber(chainPath, blockNumber) {
-    const blockPath = this.getBlockPath(chainPath, blockNumber);
-    return this.readCompressedJson(blockPath);
+    const blockPath = FileUtil.getBlockPath(chainPath, blockNumber);
+    return FileUtil.readCompressedJson(blockPath);
   }
 
   // TODO(cshcomcom): Change to asynchronous.
-  static writeBlock(chainPath, block) {
-    const blockPath = this.getBlockPath(chainPath, block.number);
+  static writeBlockFile(chainPath, block) {
+    const blockPath = FileUtil.getBlockPath(chainPath, block.number);
     if (!fs.existsSync(blockPath)) {
+      const blockDirPath = FileUtil.getBlockDirPath(chainPath, block.number);
+      if (!fs.existsSync(blockDirPath)) {
+        fs.mkdirSync(blockDirPath);
+      }
       const compressed = zlib.gzipSync(Buffer.from(JSON.stringify(block)));
       fs.writeFileSync(blockPath, compressed);
     } else {
@@ -127,30 +142,50 @@ class FileUtil {
     }
   }
 
-  static writeHashToNumber(chainPath, blockHash, blockNumber) {
+  static deleteBlockFile(chainPath, blockNumber) {
+    logger.info(`Deleting block file with block number: ${blockNumber}`);
+    const blockPath = FileUtil.getBlockPath(chainPath, blockNumber);
+    if (fs.existsSync(blockPath)) {
+      fs.unlinkSync(blockPath);
+    }
+  }
+
+  static writeH2nFile(chainPath, blockHash, blockNumber) {
     if (!blockHash || !CommonUtil.isNumber(blockNumber) || blockNumber < 0) {
-      logger.error(`Invalid writeHashToNumber parameters (${blockHash}, ${blockNumber})`);
+      logger.error(`Invalid parameters: '${blockHash}', '${blockNumber}'`);
       return;
     }
-    const hashToNumberPath = this.getHashToNumberPath(chainPath, blockHash);
-    if (!fs.existsSync(hashToNumberPath)) {
-      fs.writeFileSync(hashToNumberPath, blockNumber);
+    const h2nPath = FileUtil.getH2nPath(chainPath, blockHash);
+    if (!fs.existsSync(h2nPath)) {
+      const h2nDirPath = FileUtil.getH2nDirPath(chainPath, blockHash);
+      if (!fs.existsSync(h2nDirPath)) {
+        fs.mkdirSync(h2nDirPath);
+      }
+      fs.writeFileSync(h2nPath, blockNumber);
     } else {
-      logger.debug(`${hashToNumberPath} file already exists!`);
+      logger.debug(`${h2nPath} file already exists!`);
+    }
+  }
+
+  static deleteH2nFile(chainPath, blockHash) {
+    logger.info(`Deleting h2n file with block hash: ${blockHash}`);
+    const h2nPath = FileUtil.getH2nPath(chainPath, blockHash);
+    if (fs.existsSync(h2nPath)) {
+      fs.unlinkSync(h2nPath);
     }
   }
 
-  static readHashToNumber(chainPath, blockHash) {
+  static readH2nFile(chainPath, blockHash) {
     try {
-      const hashToNumberPath = this.getHashToNumberPath(chainPath, blockHash);
-      return Number(fs.readFileSync(hashToNumberPath).toString());
+      const h2nPath = FileUtil.getH2nPath(chainPath, blockHash);
+      return Number(fs.readFileSync(h2nPath).toString());
     } catch (err) {
       return -1;
     }
   }
 
   static writeSnapshot(snapshotPath, blockNumber, snapshot) {
-    const filePath = this.getSnapshotPathByBlockNumber(snapshotPath, blockNumber);
+    const filePath = FileUtil.getSnapshotPathByBlockNumber(snapshotPath, blockNumber);
     if (snapshot === null) { // Delete
       if (fs.existsSync(filePath)) {
         try {
@@ -164,6 +199,26 @@ class FileUtil {
       fs.writeFileSync(filePath, zlib.gzipSync(Buffer.from(JSON.stringify(snapshot))));
     }
   }
+
+  static getNumFiles(path) {
+    if (!fs.existsSync(path)) {
+      return 0;
+    }
+    return fs.readdirSync(path).length;
+  }
+
+  static getNumBlockFiles(chainPath) {
+    let numBlockFiles = 0;
+    let blockNumber = 0;
+    let numFiles;
+    do {
+      const blockDirPath = FileUtil.getBlockDirPath(chainPath, blockNumber);
+      numFiles = FileUtil.getNumFiles(blockDirPath);
+      numBlockFiles += numFiles;
+      blockNumber += CHAINS_N2B_MAX_NUM_FILES;
+    } while (numFiles > 0);
+    return numBlockFiles;
+  }
 }
 
 module.exports = FileUtil;
diff --git a/common/path-util.js b/common/path-util.js
index b7f7bc136..ee6513280 100644
--- a/common/path-util.js
+++ b/common/path-util.js
@@ -1,4 +1,8 @@
-const { PredefinedDbPaths, ShardingProperties } = require('./constants');
+const {
+  FeatureFlags,
+  PredefinedDbPaths,
+  ShardingProperties
+} = require('./constants');
 const CommonUtil = require('./common-util');
 const RuleUtil = require('../db/rule-util');
 const ruleUtil = new RuleUtil();
@@ -54,6 +58,11 @@ class PathUtil {
     return CommonUtil.formatPath([PredefinedDbPaths.MANAGE_APP, appName, PredefinedDbPaths.MANAGE_APP_CONFIG]);
   }
 
+  static getManageAppBillingUsersPath(appName, billingId) {
+    return `${PathUtil.getManageAppConfigPath(appName)}/${PredefinedDbPaths.MANAGE_APP_CONFIG_BILLING}/` +
+        `${billingId}/${PredefinedDbPaths.MANAGE_APP_CONFIG_BILLING_USERS}`;
+  }
+
   static getAppPath(appName) {
     return CommonUtil.formatPath([PredefinedDbPaths.APPS, appName]);
   }
@@ -68,6 +77,10 @@ class PathUtil {
         PredefinedDbPaths.STAKING, PredefinedDbPaths.STAKING_LOCKUP_DURATION]);
   }
 
+  static getStakingServicePath(serviceName) {
+    return CommonUtil.formatPath([PredefinedDbPaths.STAKING, serviceName]);
+  }
+
   static getStakingExpirationPath(serviceName, user, stakingKey) {
     return CommonUtil.formatPath([PredefinedDbPaths.STAKING, serviceName, user, stakingKey,
         PredefinedDbPaths.STAKING_EXPIRE_AT]);
@@ -187,7 +200,7 @@ class PathUtil {
   }
 
   static getConsensusStakingAccountBalancePath(address) {
-    const accountPath =  PathUtil.getServiceAccountPath(PredefinedDbPaths.STAKING, PredefinedDbPaths.CONSENSUS, `${address}|0`);
+    const accountPath = PathUtil.getServiceAccountPath(PredefinedDbPaths.STAKING, PredefinedDbPaths.CONSENSUS, `${address}|0`);
     return CommonUtil.appendPath(accountPath, PredefinedDbPaths.BALANCE)
   }
 
@@ -205,6 +218,30 @@ class PathUtil {
     return CommonUtil.formatPath([
         PredefinedDbPaths.GAS_FEE, PredefinedDbPaths.COLLECT, userAddr, blockNumber, txHash]);
   }
+
+  static getReceiptPath(txHash) {
+    const RECEIPT_NUM_PREFIX_LAYERS = 5;
+    const RECEIPT_PREFIX_LABEL_LENGTH = 1;
+
+    const hashPath = FeatureFlags.enableReceiptPathPrefixLayers ?
+        PathUtil.getPrefixedHashPath(
+            txHash, RECEIPT_NUM_PREFIX_LAYERS, RECEIPT_PREFIX_LABEL_LENGTH) : txHash;
+    return CommonUtil.formatPath([PredefinedDbPaths.RECEIPTS, hashPath]);
+  }
+
+  static getPrefixedHashPath(hash, numPrefixLayers, prefixLabelLength) {
+    if (!CommonUtil.isString(hash) ||
+        hash.length <= 2 + numPrefixLayers * prefixLabelLength) {
+      return hash;
+    }
+    const prefixLabels = [];
+    for (let i = 0; i < numPrefixLayers; i++) {
+      const from = i === 0 ? 0 : 2 + i * prefixLabelLength;
+      const to = 2 + (i + 1) * prefixLabelLength;
+      prefixLabels.push(hash.substring(from, to));
+    }
+    return CommonUtil.formatPath([...prefixLabels, hash]);
+  }
 }
 
 module.exports = PathUtil;
diff --git a/consensus/block-pool.js b/consensus/block-pool.js
index 40ede0a0e..993794ab9 100644
--- a/consensus/block-pool.js
+++ b/consensus/block-pool.js
@@ -316,8 +316,7 @@ class BlockPool {
     }
     const voter = voteTx.address;
     logger.debug(`[${LOG_HEADER}] voted block: ${JSON.stringify(block, null, 2)}`);
-    logger.debug(`[${LOG_HEADER}] ${block && block.validators[voter] === stake}`);
-    if (stake > 0 && block && block.validators[voter] === stake) {
+    if (stake > 0 && block && get(block, `validators.${voter}.stake`) === stake) {
       this.hashToBlockInfo[blockHash].tallied += stake;
       this.tryUpdateNotarized(blockHash);
     }
@@ -345,8 +344,8 @@ class BlockPool {
       logger.info(`[${LOG_HEADER}] Prev block is unavailable`);
       return;
     }
-    const totalAtStake = Object.values(prevBlock.validators).reduce((a, b) => {
-      return a + b;
+    const totalAtStake = Object.values(prevBlock.validators).reduce((acc, cur) => {
+      return acc + get(cur, 'stake', 0);
     }, 0);
     if (currentBlockInfo.tallied &&
         currentBlockInfo.tallied >= totalAtStake * ConsensusConsts.MAJORITY) {
@@ -362,7 +361,7 @@ class BlockPool {
     delete this.hashToNextBlockSet[blockHash];
     const db = this.hashToDb.get(blockHash);
     if (db) {
-      this.node.destroyDb(db);
+      db.destroyDb();
       this.hashToDb.delete(blockHash);
     }
   }
diff --git a/consensus/index.js b/consensus/index.js
index 06732cbf6..9a08ecf24 100644
--- a/consensus/index.js
+++ b/consensus/index.js
@@ -22,9 +22,11 @@ const {
   GENESIS_WHITELIST,
   LIGHTWEIGHT,
   MIN_NUM_VALIDATORS,
+  MAX_NUM_VALIDATORS,
   MIN_STAKE_PER_VALIDATOR,
+  MAX_STAKE_PER_VALIDATOR,
   EPOCH_MS,
-  CONSENSUS_PROTOCOL_VERSION
+  CONSENSUS_PROTOCOL_VERSION,
 } = require('../common/constants');
 const {
   ConsensusMessageTypes,
@@ -68,7 +70,7 @@ class Consensus {
   }
 
   init(lastBlockWithoutProposal) {
-    const LOG_HEADER = 'init';
+    const LOG_HEADER = 'Consensus.init';
     const finalizedNumber = this.node.bc.lastBlockNumber();
     const genesisBlock = this.node.bc.getBlockByNumber(0);
     if (!genesisBlock) {
@@ -80,7 +82,7 @@ class Consensus {
     try {
       const targetStake = process.env.STAKE ? Number(process.env.STAKE) : 0;
       const currentStake =
-          this.getValidConsensusStake(this.node.stateManager.getFinalVersion(), myAddr);
+          this.getConsensusStakeFromAddr(this.node.stateManager.getFinalVersion(), myAddr);
       logger.info(`[${LOG_HEADER}] Current stake: ${currentStake} / Target stake: ${targetStake}`);
       if (!targetStake && !currentStake) {
         logger.info(`[${LOG_HEADER}] Node doesn't have any stakes. ` +
@@ -249,7 +251,7 @@ class Consensus {
         // can keep sending messages with higher numbers, making the node's status unsynced, and
         // prevent the node from getting/handling messages properly.
         // this.node.state = BlockchainNodeStates.SYNCING;
-        Object.values(this.server.client.outbound).forEach(node => {
+        Object.values(this.server.client.outbound).forEach((node) => {
           this.server.client.requestChainSegment(node.socket, this.node.bc.lastBlock());
         });
         return;
@@ -270,44 +272,6 @@ class Consensus {
     }
   }
 
-  executeLastVoteOrAbort(db, tx) {
-    const LOG_HEADER = 'executeLastVoteOrAbort';
-    const txRes = db.executeTransaction(Transaction.toExecutable(tx));
-    if (!CommonUtil.isFailedTx(txRes)) {
-      logger.debug(`[${LOG_HEADER}] tx: success`);
-      return txRes;
-    } else {
-      logger.error(`[${LOG_HEADER}] tx: failure\n ${JSON.stringify(txRes)}`);
-      return false;
-    }
-  }
-
-  executeOrRollbackTransactionForBlock(
-      db, tx, blockNumber, validTransactions, invalidTransactions, resList) {
-    const LOG_HEADER = 'executeOrRollbackTransactionForBlock';
-    if (!db.backupDb()) {
-      logger.error(
-          `[${LOG_HEADER}] Failed to backup db for tx: ${JSON.stringify(tx, null, 2)}`);
-      return null;
-    }
-    logger.debug(`[${LOG_HEADER}] Checking tx ${JSON.stringify(tx, null, 2)}`);
-    const txRes = db.executeTransaction(Transaction.toExecutable(tx), blockNumber);
-    if (!CommonUtil.isFailedTx(txRes)) {
-      logger.debug(`[${LOG_HEADER}] tx: success`);
-      validTransactions.push(tx);
-      resList.push(txRes);
-    } else {
-      logger.debug(`[${LOG_HEADER}] tx: failure\n ${JSON.stringify(txRes)}`);
-      invalidTransactions.push(tx);
-      if (!db.restoreDb()) {
-        logger.error(
-            `[${LOG_HEADER}] Failed to restore db for tx: ${JSON.stringify(tx, null, 2)}`);
-        return null;
-      }
-    }
-    return txRes;
-  }
-
   // proposing for block #N :
   //    1. create a block (with last_votes)
   //    2. create a tx (/consensus/number/N/propose: { block_hash, ... })
@@ -348,10 +312,12 @@ class Consensus {
       lastVotes.unshift(lastBlockInfo.proposal);
     }
 
+    this.node.removeOldReceipts(blockNumber, tempDb);
+
     for (const voteTx of lastVotes) {
-      const res = this.executeLastVoteOrAbort(tempDb, voteTx);
-      if (!res) {
-        this.node.destroyDb(tempDb);
+      if (CommonUtil.isFailedTx(tempDb.executeTransaction(Transaction.toExecutable(voteTx), true))) {
+        logger.debug(`[${LOG_HEADER}] failed to execute last vote: ${JSON.stringify(voteTx, null, 2)}`);
+        tempDb.destroyDb();
         return null;
       }
     }
@@ -362,11 +328,13 @@ class Consensus {
     const invalidTransactions = [];
     const resList = [];
     for (const tx of transactions) {
-      const res = this.executeOrRollbackTransactionForBlock(
-          tempDb, tx, blockNumber, validTransactions, invalidTransactions, resList);
-      if (!res) {
-        this.node.destroyDb(tempDb);
-        return null;
+      const res = tempDb.executeTransaction(Transaction.toExecutable(tx), false, true, blockNumber);
+      if (CommonUtil.txPrecheckFailed(res)) {
+        logger.debug(`[${LOG_HEADER}] failed to execute transaction:\n${JSON.stringify(tx, null, 2)}\n${JSON.stringify(res, null, 2)})`);
+        invalidTransactions.push(tx);
+      } else {
+        validTransactions.push(tx);
+        resList.push(res);
       }
     }
     const { gasAmountTotal, gasCostTotal } =
@@ -382,11 +350,13 @@ class Consensus {
     if (this.node.bc.lastBlockNumber() < 1) {
       const whitelist = GENESIS_WHITELIST;
       for (const address in whitelist) {
-        if (Object.prototype.hasOwnProperty.call(whitelist, address)) {
-          const stakingAccount = tempDb.getValue(PathUtil.getConsensusStakingAccountPath(address));
-          if (whitelist[address] === true && stakingAccount &&
-              stakingAccount.balance >= MIN_STAKE_PER_VALIDATOR) {
-            validators[address] = stakingAccount.balance;
+        if (whitelist[address] === true) {
+          const stake = tempDb.getValue(PathUtil.getConsensusStakingAccountBalancePath(address));
+          if (stake && MIN_STAKE_PER_VALIDATOR <= stake && stake <= MAX_STAKE_PER_VALIDATOR) {
+            validators[address] = {
+              [PredefinedDbPaths.STAKE]: stake,
+              [PredefinedDbPaths.PROPOSAL_RIGHT]: true
+            };
           }
         }
       }
@@ -395,12 +365,16 @@ class Consensus {
       validators = this.getValidators(lastBlock.hash, lastBlock.number);
     }
     const numValidators = Object.keys(validators).length;
-    if (!validators || !numValidators) throw Error('No whitelisted validators');
+    if (!validators || !numValidators) {
+      tempDb.destroyDb();
+      throw Error('No whitelisted validators');
+    }
     if (numValidators < MIN_NUM_VALIDATORS) {
+      tempDb.destroyDb();
       throw Error(`Not enough validators: ${JSON.stringify(validators)}`);
     }
-    const totalAtStake = Object.values(validators).reduce(function(a, b) {
-      return a + b;
+    const totalAtStake = Object.values(validators).reduce((acc, cur) => {
+      return acc + cur[PredefinedDbPaths.STAKE];
     }, 0);
     const stateProofHash = LIGHTWEIGHT ? '' : tempDb.getStateProof('/')[ProofProperties.PROOF_HASH];
     const proposalBlock = Block.create(
@@ -448,7 +422,7 @@ class Consensus {
     if (LIGHTWEIGHT) {
       this.cache[blockNumber] = proposalBlock.hash;
     }
-    this.node.destroyDb(tempDb);
+    tempDb.destroyDb();
     return { proposalBlock, proposalTx: Transaction.toJsObject(proposalTx) };
   }
 
@@ -505,11 +479,11 @@ class Consensus {
     }
     const prevBlock = number > 1 ? prevBlockInfo.block : prevBlockInfo;
 
-    // Make sure we have at least MIN_NUM_VALIDATORS validators.
-    if (Object.keys(validators).length < MIN_NUM_VALIDATORS) {
+    // Make sure we have validators within MIN_NUM_VALIDATORS and MAX_NUM_VALIDATORS.
+    if (Object.keys(validators).length < MIN_NUM_VALIDATORS || Object.keys(validators).length > MAX_NUM_VALIDATORS) {
       logger.error(
-          `[${LOG_HEADER}] Validator set smaller than MIN_NUM_VALIDATORS: ` +
-          `${JSON.stringify(validators)}`);
+          `[${LOG_HEADER}] Invalid validator set size (${JSON.stringify(validators)})\n` +
+          `MIN_NUM_VALIDATORS: ${MIN_NUM_VALIDATORS}, MAX_NUM_VALIDATORS: ${MAX_NUM_VALIDATORS}`);
       return false;
     }
 
@@ -554,25 +528,21 @@ class Consensus {
         return null;
       }
       if (isSnapDb) {
-        this.node.destroyDb(prevDb);
+        prevDb.destroyDb();
       }
-      let hasInvalidLastVote = false;
       for (const voteTx of last_votes) {
         if (voteTx.hash === prevBlockProposal.hash) continue;
         if (!Consensus.isValidConsensusTx(voteTx) ||
             CommonUtil.isFailedTx(
-                tempDb.executeTransaction(Transaction.toExecutable(voteTx)))) {
+                tempDb.executeTransaction(Transaction.toExecutable(voteTx), true))) {
           logger.error(`[${LOG_HEADER}] voting tx execution for prev block failed`);
-          hasInvalidLastVote = true;
+          tempDb.destroyDb();
+          return false;
         } else {
           this.blockPool.addSeenVote(voteTx);
         }
       }
-      this.node.destroyDb(tempDb);
-      if (hasInvalidLastVote) {
-        logger.error(`[${LOG_HEADER}] Invalid proposalBlock: has invalid last_votes`);
-        return false;
-      }
+      tempDb.destroyDb();
       prevBlockInfo = this.blockPool.hashToBlockInfo[last_hash];
       if (!prevBlockInfo.notarized) {
         logger.error(`[${LOG_HEADER}] Block's last_votes don't correctly notarize ` +
@@ -618,30 +588,31 @@ class Consensus {
       return null;
     }
     if (isSnapDb) {
-      this.node.destroyDb(prevDb);
+      prevDb.destroyDb();
     }
-    const lastVoteRes = newDb.executeTransactionList(last_votes);
-    if (!lastVoteRes) {
+
+    this.node.removeOldReceipts(number, newDb);
+    if (!newDb.executeTransactionList(last_votes, true)) {
       logger.error(`[${LOG_HEADER}] Failed to execute last votes`);
-      this.node.destroyDb(newDb);
+      newDb.destroyDb();
       return false;
     }
-    const txsRes = newDb.executeTransactionList(transactions, number);
+    const txsRes = newDb.executeTransactionList(transactions, false, true, number);
     if (!txsRes) {
       logger.error(`[${LOG_HEADER}] Failed to execute transactions`);
-      this.node.destroyDb(newDb);
+      newDb.destroyDb();
       return false;
     }
     const { gasAmountTotal, gasCostTotal } =
         CommonUtil.getServiceGasCostTotalFromTxList(transactions, txsRes);
     if (gasAmountTotal !== gas_amount_total) {
       logger.error(`[${LOG_HEADER}] Invalid gas_amount_total`);
-      this.node.destroyDb(newDb);
+      newDb.destroyDb();
       return false;
     }
     if (gasCostTotal !== gas_cost_total) {
       logger.error(`[${LOG_HEADER}] Invalid gas_cost_total`);
-      this.node.destroyDb(newDb);
+      newDb.destroyDb();
       return false;
     }
 
@@ -650,7 +621,7 @@ class Consensus {
     if (!executableTx) {
       logger.error(`[${LOG_HEADER}] Failed to create a transaction with a proposal: ` +
           `${JSON.stringify(proposalTx, null, 2)}`);
-      this.node.destroyDb(newDb);
+      newDb.destroyDb();
       return false;
     }
     const tempDb = this.node.createTempDb(
@@ -658,31 +629,31 @@ class Consensus {
         prevBlock.number - 1);
     if (!tempDb) {
       logger.error(`Failed to create a temp database with state version: ${newDb.stateVersion}.`);
+      newDb.destroyDb();
       return null;
     }
-    const proposalTxExecRes = tempDb.executeTransaction(executableTx);
+    const proposalTxExecRes = tempDb.executeTransaction(executableTx, true);
     if (CommonUtil.isFailedTx(proposalTxExecRes)) {
       logger.error(
           `[${LOG_HEADER}] Failed to execute the proposal tx: ` +
           `${JSON.stringify(proposalTxExecRes)}`);
-      this.node.destroyDb(tempDb);
-      this.node.destroyDb(newDb);
+      newDb.destroyDb();
+      tempDb.destroyDb();
       return false;
     }
-    this.node.destroyDb(tempDb);
+    tempDb.destroyDb();
     this.node.tp.addTransaction(executableTx);
     newDb.blockNumberSnapshot += 1;
     if (!LIGHTWEIGHT) {
       if (newDb.getStateProof('/')[ProofProperties.PROOF_HASH] !== state_proof_hash) {
         logger.error(`[${LOG_HEADER}] State proof hashes don't match: ` +
             `${newDb.getStateProof('/')[ProofProperties.PROOF_HASH]} / ` +
-            `${state_proof_hash}`);
-        this.node.destroyDb(newDb);
+            `${state_proof_hash}\n\n${JSON.stringify(proposalBlock, null, 2)}`);
         return false;
       }
     }
     if (!this.blockPool.addSeenBlock(proposalBlock, proposalTx)) {
-      this.node.destroyDb(newDb);
+      newDb.destroyDb();
       return false;
     }
     this.blockPool.hashToDb.set(hash, newDb);
@@ -723,8 +694,8 @@ class Consensus {
           `[${LOG_HEADER}] No state snapshot available for vote ${JSON.stringify(executableTx)}`);
       return false;
     }
-    const voteTxRes = tempDb.executeTransaction(executableTx);
-    this.node.destroyDb(tempDb);
+    const voteTxRes = tempDb.executeTransaction(executableTx, true);
+    tempDb.destroyDb();
     if (CommonUtil.isFailedTx(voteTxRes)) {
       logger.error(`[${LOG_HEADER}] Failed to execute the voting tx: ${JSON.stringify(voteTxRes)}`);
       return false;
@@ -778,8 +749,8 @@ class Consensus {
 
   vote(block) {
     const myAddr = this.node.account.address;
-    const myStake = block.validators[myAddr];
-    if (!myStake) {
+    const isValidator = block.validators[myAddr];
+    if (!isValidator) {
       return;
     }
     const operation = {
@@ -787,7 +758,7 @@ class Consensus {
       ref: PathUtil.getConsensusVotePath(block.number, myAddr),
       value: {
         [PredefinedDbPaths.BLOCK_HASH]: block.hash,
-        [PredefinedDbPaths.STAKE]: myStake
+        [PredefinedDbPaths.STAKE]: isValidator.stake
       }
     };
     const voteTx = this.node.createTransaction({ operation, nonce: -1, gas_price: 1 });
@@ -934,8 +905,12 @@ class Consensus {
       const block = chain.shift();
       const blockNumber = block.number;
       logger.debug(`[${LOG_HEADER}] applying block ${JSON.stringify(block)}`);
-      snapDb.executeTransactionList(block.last_votes);
-      snapDb.executeTransactionList(block.transactions, blockNumber);
+      const executeRes = this.node.applyBlocksToDb([block], snapDb);
+      if (executeRes !== true) {
+        logger.error(`[${LOG_HEADER}] Failed to execute block`);
+        snapDb.destroyDb();
+        return null;
+      }
       snapDb.blockNumberSnapshot = blockNumber;
     }
     return snapDb;
@@ -977,20 +952,49 @@ class Consensus {
       logger.error(err);
       throw Error(err);
     }
-    const whitelist = this.getWhitelist(stateVersion);
+    let candidates = [];
     const validators = {};
-    Object.keys(whitelist).forEach((address) => {
-      const stake = this.getValidConsensusStake(stateVersion, address);
-      if (whitelist[address] === true && stake >= MIN_STAKE_PER_VALIDATOR) {
-        validators[address] = stake;
+    const whitelist = this.getWhitelist(stateVersion);
+    const stateRoot = this.node.stateManager.getRoot(stateVersion);
+    const allStakeInfo = DB.getValueFromStateRoot(
+        stateRoot, PathUtil.getStakingServicePath(PredefinedDbPaths.CONSENSUS)) || {};
+    for (const [address, stakeInfo] of Object.entries(allStakeInfo)) {
+      const stake = this.getConsensusStakeFromAddr(stateVersion, address);
+      if (stake) {
+        if (whitelist[address] === true) {
+          if (MIN_STAKE_PER_VALIDATOR <= stake && stake <= MAX_STAKE_PER_VALIDATOR) {
+            validators[address] = {
+              [PredefinedDbPaths.STAKE]: stake,
+              [PredefinedDbPaths.PROPOSAL_RIGHT]: true
+            };
+          }
+        } else {
+          candidates.push({
+            address,
+            stake,
+            expireAt: _.get(stakeInfo, `0.${PredefinedDbPaths.STAKING_EXPIRE_AT}`, 0)
+          });
+        }
       }
-    });
+    }
+    // NOTE(liayoo): tie-breaking by addresses as a temporary solution.
+    candidates = _.orderBy(candidates, ['stake', 'expireAt', 'address'], ['desc', 'desc', 'asc']);
+    for (const candidate of candidates) {
+      if (Object.keys(validators).length < MAX_NUM_VALIDATORS) {
+        validators[candidate.address] = {
+          [PredefinedDbPaths.STAKE]: candidate.stake,
+          [PredefinedDbPaths.PROPOSAL_RIGHT]: false
+        };
+      } else {
+        break;
+      }
+    }
     logger.debug(`[${LOG_HEADER}] validators: ${JSON.stringify(validators, null, 2)}, ` +
         `whitelist: ${JSON.stringify(whitelist, null, 2)}`);
     return validators;
   }
 
-  getValidConsensusStake(stateVersion, address) {
+  getConsensusStakeFromAddr(stateVersion, address) {
     const stateRoot = this.node.stateManager.getRoot(stateVersion);
     return DB.getValueFromStateRoot(
         stateRoot, PathUtil.getConsensusStakingAccountBalancePath(address)) || 0;
@@ -1056,7 +1060,7 @@ class Consensus {
         }
         opList.push({
           type: WriteDbOperations.SET_VALUE,
-          ref: `${shardingPath}/${ShardingProperties.SHARD}/` +
+          ref: `${shardingPath}/${PredefinedDbPaths.DOT_SHARD}/` +
               `${ShardingProperties.PROOF_HASH_MAP}/${blockNumberToReport}/` +
               `${ShardingProperties.PROOF_HASH}`,
           value: block.state_proof_hash
@@ -1066,7 +1070,7 @@ class Consensus {
           // Remove old reports
           opList.push({
             type: WriteDbOperations.SET_VALUE,
-            ref: `${shardingPath}/${ShardingProperties.SHARD}/` +
+            ref: `${shardingPath}/${PredefinedDbPaths.DOT_SHARD}/` +
                 `${ShardingProperties.PROOF_HASH_MAP}/` +
                 `${blockNumberToReport - MAX_SHARD_REPORT}/` +
                 `${ShardingProperties.PROOF_HASH}`,
@@ -1102,7 +1106,7 @@ class Consensus {
         'ain_get',
         {
           type: ReadDbOperations.GET_VALUE,
-          ref: `${shardingPath}/${ShardingProperties.SHARD}/` +
+          ref: `${shardingPath}/${PredefinedDbPaths.DOT_SHARD}/` +
           `${ShardingProperties.PROOF_HASH_MAP}/${ShardingProperties.LATEST}`
         }
     );
@@ -1201,22 +1205,27 @@ class Consensus {
   static selectProposer(seed, validators) {
     const LOG_HEADER = 'selectProposer';
     logger.debug(`[${LOG_HEADER}] seed: ${seed}, validators: ${JSON.stringify(validators)}`);
-    const alphabeticallyOrderedValidators = Object.keys(validators).sort();
-    const totalAtStake = Object.values(validators).reduce((a, b) => {
-      return a + b;
+    const validatorsWithProducingRights = _.pickBy(validators, (x) => {
+      return _.get(x, PredefinedDbPaths.PROPOSAL_RIGHT) === true;
+    });
+    const alphabeticallyOrderedValidators = Object.keys(validatorsWithProducingRights).sort();
+    const totalAtStake = Object.values(validatorsWithProducingRights).reduce((acc, cur) => {
+      return acc + cur[PredefinedDbPaths.STAKE];
     }, 0);
     const randomNumGenerator = seedrandom(seed);
     const targetValue = randomNumGenerator() * totalAtStake;
     let cumulative = 0;
     for (let i = 0; i < alphabeticallyOrderedValidators.length; i++) {
-      cumulative += validators[alphabeticallyOrderedValidators[i]];
+      const addr = alphabeticallyOrderedValidators[i];
+      cumulative += validatorsWithProducingRights[addr][PredefinedDbPaths.STAKE];
       if (cumulative > targetValue) {
-        logger.info(`Proposer is ${alphabeticallyOrderedValidators[i]}`);
-        return alphabeticallyOrderedValidators[i];
+        logger.info(`Proposer is ${addr}`);
+        return addr;
       }
     }
-    logger.error(`[${LOG_HEADER}] Failed to get the proposer.\nvalidators: ` +
-        `${alphabeticallyOrderedValidators}\n` +
+    logger.error(
+        `[${LOG_HEADER}] Failed to get the proposer.\n` +
+        `alphabeticallyOrderedValidators: ${alphabeticallyOrderedValidators}\n` +
         `totalAtStake: ${totalAtStake}\nseed: ${seed}\ntargetValue: ${targetValue}`);
     return null;
   }
diff --git a/db/functions.js b/db/functions.js
index 484cdeb21..a199775e0 100644
--- a/db/functions.js
+++ b/db/functions.js
@@ -198,7 +198,7 @@ class Functions {
             }));
             funcResults[functionEntry.function_id] = {
               code: FunctionResultCode.SUCCESS,
-              gas_amount: GasFeeConstants.REST_FUNCTION_CALL_GAS_AMOUNT,
+              bandwidth_gas_amount: GasFeeConstants.REST_FUNCTION_CALL_GAS_AMOUNT,
             };
             triggerCount++;
           }
@@ -263,10 +263,6 @@ class Functions {
     return call && call.fidList && call.fidList.includes(fid);
   }
 
-  static getOpResultList(context) {
-    return JSON.parse(JSON.stringify(context.opResultList));
-  }
-
   static addToOpResultList(path, result, context) {
     context.opResultList.push({ path, result, });
   }
@@ -300,7 +296,7 @@ class Functions {
 
     for (const key in obj) {
       const childObj = obj[key];
-      if (key === FunctionProperties.FUNCTION) {
+      if (key === PredefinedDbPaths.DOT_FUNCTION) {
         if (CommonUtil.isDict(childObj) && !CommonUtil.isEmpty(childObj)) {
           for (const fid in childObj) {
             const nativeFunction = this.nativeFunctionMap[fid];
@@ -406,10 +402,10 @@ class Functions {
   buildFuncResultToReturn(context, code, extraGasAmount = 0) {
     const result = {
       code,
-      gas_amount: this.nativeFunctionMap[context.fid].extraGasAmount
+      bandwidth_gas_amount: this.nativeFunctionMap[context.fid].extraGasAmount
     };
     if (CommonUtil.isNumber(extraGasAmount) && extraGasAmount > 0) {
-      result.gas_amount += extraGasAmount;
+      result.bandwidth_gas_amount += extraGasAmount;
     }
     return result;
   }
@@ -427,10 +423,10 @@ class Functions {
   }
 
   returnFuncResult(context, code, extraGasAmount = 0) {
-    const opResultList = Functions.getOpResultList(context);
+    const opResultListObj = CommonUtil.convertListToObj(context.opResultList);
     const funcResultToReturn = {};
-    if (!CommonUtil.isEmpty(opResultList)) {
-      funcResultToReturn.op_results = opResultList;
+    if (!CommonUtil.isEmpty(opResultListObj)) {
+      funcResultToReturn.op_results = opResultListObj;
     }
     Object.assign(funcResultToReturn, this.buildFuncResultToReturn(context, code, extraGasAmount));
     return funcResultToReturn;
@@ -489,7 +485,7 @@ class Functions {
     const parsedValuePath = context.valuePath;
     const auth = context.auth;
     const owner = {
-      [OwnerProperties.OWNER]: {
+      [PredefinedDbPaths.DOT_OWNER]: {
         [OwnerProperties.OWNERS]: {
           [auth.addr]: buildOwnerPermissions(false, true, true, true),
           [OwnerProperties.ANYONE]: buildOwnerPermissions(false, true, true, true),
@@ -536,37 +532,26 @@ class Functions {
         context, resultPath, FunctionResultCode.SUCCESS, extraGasAmount);
   }
 
-  _createApp(value, context) {
-    const { isValidServiceName } = require('./state-util');
-
-    const appName = context.params.app_name;
-    const recordId = context.params.record_id;
-    const resultPath = PathUtil.getCreateAppResultPath(appName, recordId);
+  sanitizeCreateAppConfig(rawVal) {
     const sanitizedVal = {};
-    const adminConfig = value[PredefinedDbPaths.MANAGE_APP_CONFIG_ADMIN];
-    const billingConfig = _.get(value, PredefinedDbPaths.MANAGE_APP_CONFIG_BILLING);
-    const serviceConfig = _.get(value, PredefinedDbPaths.MANAGE_APP_CONFIG_SERVICE);
-    if (!isValidServiceName(appName)) {
-      return this.saveAndReturnFuncResult(
-          context, resultPath, FunctionResultCode.INVALID_SERVICE_NAME);
-    }
+    const adminConfig = _.get(rawVal, PredefinedDbPaths.MANAGE_APP_CONFIG_ADMIN);
+    const billingConfig = _.get(rawVal, PredefinedDbPaths.MANAGE_APP_CONFIG_BILLING);
+    const serviceConfig = _.get(rawVal, PredefinedDbPaths.MANAGE_APP_CONFIG_SERVICE);
+    const isPublic = _.get(rawVal, PredefinedDbPaths.MANAGE_APP_CONFIG_IS_PUBLIC);
     if (!CommonUtil.isDict(adminConfig)) {
-      return this.saveAndReturnFuncResult(context, resultPath, FunctionResultCode.FAILURE);
+      return { errorCode: FunctionResultCode.FAILURE };
     }
-    if (adminConfig) {
-      sanitizedVal[PredefinedDbPaths.MANAGE_APP_CONFIG_ADMIN] = adminConfig;
-      const appPath = PathUtil.getAppPath(appName);
-      const owner = {};
-      let rule = '';
-      const adminAddrList = Object.keys(adminConfig);
-      for (let i = 0; i < adminAddrList.length; i++) {
-        const addr = adminAddrList[i];
-        CommonUtil.setJsObject(owner, [OwnerProperties.OWNER, OwnerProperties.OWNERS, addr],
-            buildOwnerPermissions(true, true, true, true));
-        rule += `auth.addr === '${addr}'` + (i < adminAddrList.length - 1 ? ' || ' : '');
+    for (const [addr, val] of Object.entries(adminConfig)) {
+      if (!CommonUtil.isCksumAddr(addr) || !CommonUtil.isBool(val)) {
+        return { errorCode: FunctionResultCode.FAILURE };
       }
-      this.setRuleOrLog(appPath, buildRulePermission(rule), context);
-      this.setOwnerOrLog(appPath, owner, context);
+    }
+    sanitizedVal[PredefinedDbPaths.MANAGE_APP_CONFIG_ADMIN] = adminConfig;
+    if (!CommonUtil.isBool(isPublic) && isPublic !== undefined) {
+      return { errorCode: FunctionResultCode.FAILURE };
+    }
+    if (isPublic) {
+      sanitizedVal[PredefinedDbPaths.MANAGE_APP_CONFIG_IS_PUBLIC] = true;
     }
     if (billingConfig) {
       sanitizedVal[PredefinedDbPaths.MANAGE_APP_CONFIG_BILLING] = billingConfig;
@@ -574,6 +559,44 @@ class Functions {
     if (serviceConfig) {
       sanitizedVal[PredefinedDbPaths.MANAGE_APP_CONFIG_SERVICE] = serviceConfig;
     }
+    if (!_.isEqual(sanitizedVal, rawVal, { strict: true })) {
+      return { errorCode: FunctionResultCode.FAILURE };
+    }
+    return { sanitizedVal, errorCode: null };
+  }
+
+  _createApp(value, context) {
+    const { isValidServiceName } = require('./state-util');
+    const appName = context.params.app_name;
+    const recordId = context.params.record_id;
+    const resultPath = PathUtil.getCreateAppResultPath(appName, recordId);
+    if (!isValidServiceName(appName)) {
+      return this.saveAndReturnFuncResult(context, resultPath, FunctionResultCode.INVALID_SERVICE_NAME);
+    }
+    const { sanitizedVal, errorCode } = this.sanitizeCreateAppConfig(value);
+    if (errorCode) {
+      return this.saveAndReturnFuncResult(context, resultPath, errorCode);
+    }
+    let rule;
+    const owner = {};
+    const adminAddrList = Object.keys(sanitizedVal[PredefinedDbPaths.MANAGE_APP_CONFIG_ADMIN]);
+    adminAddrList.forEach((addr) => {
+      CommonUtil.setJsObject(
+          owner, [PredefinedDbPaths.DOT_OWNER, OwnerProperties.OWNERS, addr],
+          buildOwnerPermissions(true, true, true, true));
+    });
+    if (sanitizedVal[PredefinedDbPaths.MANAGE_APP_CONFIG_IS_PUBLIC]) {
+      rule = true;
+      // Additionally set anyone to have owner permissions, except for the write_owner permission.
+      CommonUtil.setJsObject(
+          owner, [PredefinedDbPaths.DOT_OWNER, OwnerProperties.OWNERS, OwnerProperties.ANYONE],
+          buildOwnerPermissions(true, true, false, true));
+    } else {
+      rule = adminAddrList.map((addr) => `auth.addr === '${addr}'`).join(' || ');
+    }
+    const appPath = PathUtil.getAppPath(appName);
+    this.setRuleOrLog(appPath, buildRulePermission(rule), context);
+    this.setOwnerOrLog(appPath, owner, context);
     const manageAppConfigPath = PathUtil.getManageAppConfigPath(appName);
     const result = this.setValueOrLog(manageAppConfigPath, sanitizedVal, context);
     if (!CommonUtil.isFailedTx(result)) {
@@ -594,7 +617,6 @@ class Functions {
       return this.returnFuncResult(context, FunctionResultCode.SUCCESS);
     } else {
       logger.error(`  ===> _collectFee failed: ${JSON.stringify(result)}`);
-      // TODO(liayoo): Return error, check in setValue(), revert changes.
       return this.returnFuncResult(context, FunctionResultCode.FAILURE);
     }
   }
diff --git a/db/index.js b/db/index.js
index 2a81a518e..6c549d9a1 100644
--- a/db/index.js
+++ b/db/index.js
@@ -13,10 +13,19 @@ const {
   GenesisAccounts,
   GenesisSharding,
   StateVersions,
+  buildOwnerPermissions,
   LIGHTWEIGHT,
   TREE_HEIGHT_LIMIT,
   TREE_SIZE_LIMIT,
-  buildOwnerPermissions,
+  SERVICE_TREE_SIZE_BUDGET,
+  APPS_TREE_SIZE_BUDGET,
+  FREE_TREE_SIZE_BUDGET,
+  SERVICE_STATE_BUDGET,
+  APPS_STATE_BUDGET,
+  FREE_STATE_BUDGET,
+  STATE_GAS_COEFFICIENT,
+  MIN_STAKING_FOR_APP_TX,
+  MIN_BALANCE_FOR_SERVICE_TX,
 } = require('../common/constants');
 const CommonUtil = require('../common/common-util');
 const Transaction = require('../tx-pool/transaction');
@@ -72,7 +81,7 @@ class DB {
     } else {
       // Initialize DB owners.
       this.writeDatabase([PredefinedDbPaths.OWNERS_ROOT], {
-        [OwnerProperties.OWNER]: {
+        [PredefinedDbPaths.DOT_OWNER]: {
           [OwnerProperties.OWNERS]: {
             [OwnerProperties.ANYONE]: buildOwnerPermissions(true, true, true, true),
           }
@@ -80,7 +89,9 @@ class DB {
       });
       // Initialize DB rules.
       this.writeDatabase([PredefinedDbPaths.RULES_ROOT], {
-        [RuleProperties.WRITE]: true
+        [PredefinedDbPaths.DOT_RULE]: {
+          [RuleProperties.WRITE]: true
+        }
       });
     }
   }
@@ -220,11 +231,35 @@ class DB {
     return true;
   }
 
-  dumpDbStates() {
+  destroyDb() {
+    const LOG_HEADER = 'destroyDb';
+    logger.debug(`[${LOG_HEADER}] Destroying DB with state version: ${this.stateVersion}`);
+    this.deleteStateVersion();
+    this.deleteBackupStateVersion();
+  }
+
+  static create(baseVersion, newVersion, bc, tp, finalizeVersion, isNodeDb, blockNumberSnapshot, stateManager) {
+    const LOG_HEADER = 'create';
+
+    logger.debug(`[${LOG_HEADER}] Creating a new DB by cloning state version: ` +
+        `${baseVersion} -> ${newVersion}`);
+    const newRoot = stateManager.cloneVersion(baseVersion, newVersion);
+    if (!newRoot) {
+      logger.error(
+          `[${LOG_HEADER}] Failed to clone state version: ${baseVersion} -> ${newVersion}`);
+      return null;
+    }
+    if (finalizeVersion) {
+      stateManager.finalizeVersion(newVersion);
+    }
+    return new DB(newRoot, newVersion, bc, tp, isNodeDb, blockNumberSnapshot, stateManager);
+  }
+
+  dumpDbStates(options) {
     if (this.stateRoot === null) {
       return null;
     }
-    return this.stateRoot.toJsObject(true);
+    return this.stateRoot.toJsObject(options);
   }
 
   // For testing purpose only.
@@ -395,10 +430,11 @@ class DB {
     return DB.removeEmptyNodesRecursive(fullPath, 0, stateRoot);
   }
 
-  static readFromStateRoot(stateRoot, rootLabel, refPath, isShallow, isGlobal, shardingPath) {
+  static readFromStateRoot(stateRoot, rootLabel, refPath, options, shardingPath) {
+    const isGlobal = options && options.isGlobal;
     if (!stateRoot) return null;
     const parsedPath = CommonUtil.parsePath(refPath);
-    const localPath = isGlobal === true ? DB.toLocalPath(parsedPath, shardingPath) : parsedPath;
+    const localPath = isGlobal ?  DB.toLocalPath(parsedPath, shardingPath) : parsedPath;
     if (localPath === null) {
       // No matched local path.
       return null;
@@ -408,32 +444,28 @@ class DB {
     if (stateNode === null) {
       return null;
     }
-    if (isShallow) {
-      return stateNode.toJsObjectShallow();
-    } else {
-      return stateNode.toJsObject();
-    }
+    return stateNode.toJsObject(options);
   }
 
-  readDatabase(refPath, rootLabel, isShallow, isGlobal) {
-    return DB.readFromStateRoot(this.stateRoot, rootLabel, refPath, isShallow, isGlobal, this.shardingPath);
+  readDatabase(refPath, rootLabel, options) {
+    return DB.readFromStateRoot(this.stateRoot, rootLabel, refPath, options, this.shardingPath);
   }
 
   // TODO(platfowner): Support lookups on the final version.
-  getValue(valuePath, isShallow, isGlobal) {
-    return this.readDatabase(valuePath, PredefinedDbPaths.VALUES_ROOT, isShallow, isGlobal);
+  getValue(valuePath, options) {
+    return this.readDatabase(valuePath, PredefinedDbPaths.VALUES_ROOT, options);
   }
 
-  getFunction(functionPath, isShallow, isGlobal) {
-    return this.readDatabase(functionPath, PredefinedDbPaths.FUNCTIONS_ROOT, isShallow, isGlobal);
+  getFunction(functionPath, options) {
+    return this.readDatabase(functionPath, PredefinedDbPaths.FUNCTIONS_ROOT, options);
   }
 
-  getRule(rulePath, isShallow, isGlobal) {
-    return this.readDatabase(rulePath, PredefinedDbPaths.RULES_ROOT, isShallow, isGlobal);
+  getRule(rulePath, options) {
+    return this.readDatabase(rulePath, PredefinedDbPaths.RULES_ROOT, options);
   }
 
-  getOwner(ownerPath, isShallow, isGlobal) {
-    return this.readDatabase(ownerPath, PredefinedDbPaths.OWNERS_ROOT, isShallow, isGlobal);
+  getOwner(ownerPath, options) {
+    return this.readDatabase(ownerPath, PredefinedDbPaths.OWNERS_ROOT, options);
   }
 
   /**
@@ -461,9 +493,9 @@ class DB {
     return rootProof;
   }
 
-  static getValueFromStateRoot(stateRoot, statePath) {
+  static getValueFromStateRoot(stateRoot, statePath, isShallow = false) {
     return DB.readFromStateRoot(
-        stateRoot, PredefinedDbPaths.VALUES_ROOT, statePath, false, [], false);
+        stateRoot, PredefinedDbPaths.VALUES_ROOT, statePath, { isShallow }, []);
   }
 
   /**
@@ -479,42 +511,52 @@ class DB {
     return {
       [StateInfoProperties.TREE_HEIGHT]: stateNode.getTreeHeight(),
       [StateInfoProperties.TREE_SIZE]: stateNode.getTreeSize(),
+      [StateInfoProperties.TREE_BYTES]: stateNode.getTreeBytes(),
+      [StateInfoProperties.PROOF_HASH]: stateNode.getProofHash(),
+      [StateInfoProperties.VERSION]: stateNode.getVersion(),
     };
   }
 
-  matchFunction(funcPath, isGlobal) {
+  matchFunction(funcPath, options) {
+    const isGlobal = options && options.isGlobal;
     const parsedPath = CommonUtil.parsePath(funcPath);
-    const localPath = isGlobal === true ? DB.toLocalPath(parsedPath, this.shardingPath) : parsedPath;
+    const localPath = isGlobal ? DB.toLocalPath(parsedPath, this.shardingPath) : parsedPath;
     if (localPath === null) {
       // No matched local path.
       return null;
     }
-    return this.convertFunctionMatch(this.matchFunctionForParsedPath(localPath), isGlobal);
+    return this.convertFunctionMatch(
+        this.matchFunctionForParsedPath(localPath), isGlobal);
   }
 
-  matchRule(valuePath, isGlobal) {
+  matchRule(valuePath, options) {
+    const isGlobal = options && options.isGlobal;
     const parsedPath = CommonUtil.parsePath(valuePath);
-    const localPath = isGlobal === true ? DB.toLocalPath(parsedPath, this.shardingPath) : parsedPath;
+    const localPath = isGlobal ? DB.toLocalPath(parsedPath, this.shardingPath) : parsedPath;
     if (localPath === null) {
       // No matched local path.
       return null;
     }
-    return this.convertRuleMatch(this.matchRuleForParsedPath(localPath), isGlobal);
+    return this.convertRuleMatch(
+        this.matchRuleForParsedPath(localPath), isGlobal);
   }
 
-  matchOwner(rulePath, isGlobal) {
+  matchOwner(rulePath, options) {
+    const isGlobal = options && options.isGlobal;
     const parsedPath = CommonUtil.parsePath(rulePath);
-    const localPath = isGlobal === true ? DB.toLocalPath(parsedPath, this.shardingPath) : parsedPath;
+    const localPath = isGlobal ? DB.toLocalPath(parsedPath, this.shardingPath) : parsedPath;
     if (localPath === null) {
       // No matched local path.
       return null;
     }
-    return this.convertOwnerMatch(this.matchOwnerForParsedPath(localPath), isGlobal);
+    return this.convertOwnerMatch(
+        this.matchOwnerForParsedPath(localPath), isGlobal);
   }
 
-  evalRule(valuePath, value, auth, timestamp, isGlobal) {
+  evalRule(valuePath, value, auth, timestamp, options) {
+    const isGlobal = options && options.isGlobal;
     const parsedPath = CommonUtil.parsePath(valuePath);
-    const localPath = isGlobal === true ? DB.toLocalPath(parsedPath, this.shardingPath) : parsedPath;
+    const localPath = isGlobal ? DB.toLocalPath(parsedPath, this.shardingPath) : parsedPath;
     if (localPath === null) {
       // No matched local path.
       return null;
@@ -522,9 +564,10 @@ class DB {
     return this.getPermissionForValue(localPath, value, auth, timestamp);
   }
 
-  evalOwner(refPath, permission, auth, isGlobal) {
+  evalOwner(refPath, permission, auth, options) {
+    const isGlobal = options && options.isGlobal;
     const parsedPath = CommonUtil.parsePath(refPath);
-    const localPath = isGlobal === true ? DB.toLocalPath(parsedPath, this.shardingPath) : parsedPath;
+    const localPath = isGlobal ? DB.toLocalPath(parsedPath, this.shardingPath) : parsedPath;
     if (localPath === null) {
       // No matched local path.
       return null;
@@ -538,19 +581,19 @@ class DB {
     const resultList = [];
     opList.forEach((op) => {
       if (op.type === undefined || op.type === ReadDbOperations.GET_VALUE) {
-        resultList.push(this.getValue(op.ref, op.is_shallow, op.is_global));
+        resultList.push(this.getValue(op.ref, CommonUtil.toGetOptions(op)));
       } else if (op.type === ReadDbOperations.GET_RULE) {
-        resultList.push(this.getRule(op.ref, op.is_shallow, op.is_global));
+        resultList.push(this.getRule(op.ref, CommonUtil.toGetOptions(op)));
       } else if (op.type === ReadDbOperations.GET_FUNCTION) {
-        resultList.push(this.getFunction(op.ref, op.is_shallow, op.is_global));
+        resultList.push(this.getFunction(op.ref, CommonUtil.toGetOptions(op)));
       } else if (op.type === ReadDbOperations.GET_OWNER) {
-        resultList.push(this.getOwner(op.ref, op.is_shallow, op.is_global));
+        resultList.push(this.getOwner(op.ref, CommonUtil.toGetOptions(op)));
       } else if (op.type === ReadDbOperations.MATCH_FUNCTION) {
-        resultList.push(this.matchFunction(op.ref, op.is_global));
+        resultList.push(this.matchFunction(op.ref, CommonUtil.toMatchOrEvalOptions(op)));
       } else if (op.type === ReadDbOperations.MATCH_RULE) {
-        resultList.push(this.matchRule(op.ref, op.is_global));
+        resultList.push(this.matchRule(op.ref, CommonUtil.toMatchOrEvalOptions(op)));
       } else if (op.type === ReadDbOperations.MATCH_OWNER) {
-        resultList.push(this.matchOwner(op.ref, op.is_global));
+        resultList.push(this.matchOwner(op.ref, CommonUtil.toMatchOrEvalOptions(op)));
       } else if (op.type === ReadDbOperations.EVAL_RULE) {
         const auth = {};
         if (op.address) {
@@ -559,8 +602,9 @@ class DB {
         if (op.fid) {
           auth.fid = op.fid;
         }
+        const timestamp = op.timestamp || Date.now();
         resultList.push(this.evalRule(
-            op.ref, op.value, auth, op.timestamp || Date.now(), op.is_global));
+            op.ref, op.value, auth, timestamp, CommonUtil.toMatchOrEvalOptions(op)));
       } else if (op.type === ReadDbOperations.EVAL_OWNER) {
         const auth = {};
         if (op.address) {
@@ -569,7 +613,8 @@ class DB {
         if (op.fid) {
           auth.fid = op.fid;
         }
-        resultList.push(this.evalOwner(op.ref, op.permission, auth, op.is_global));
+        resultList.push(this.evalOwner(
+            op.ref, op.permission, auth, CommonUtil.toMatchOrEvalOptions(op)));
       }
     });
     return resultList;
@@ -618,13 +663,11 @@ class DB {
         this.stateRoot, this.stateVersion, address, nonce, timestamp);
   }
 
-  // TODO(platfowner): Use shallow fetch once available.
   static getAppStakesTotalFromStateRoot(stateRoot) {
-    const appStakes = DB.getValueFromStateRoot(stateRoot, PredefinedDbPaths.STAKING) || {};
-    return Object.keys(appStakes).reduce((acc, cur) => {
-      if (cur === PredefinedDbPaths.CONSENSUS) return acc;
-      return acc + _.get(appStakes[cur], PredefinedDbPaths.STAKING_BALANCE_TOTAL, 0);
-    }, 0);
+    const appStakes = DB.getValueFromStateRoot(stateRoot, PredefinedDbPaths.STAKING, true) || {};
+    return Object.keys(appStakes).filter((appName) => appName !== PredefinedDbPaths.CONSENSUS)
+        .reduce((acc, appName) => acc +
+            DB.getValueFromStateRoot(stateRoot, PathUtil.getStakingBalanceTotalPath(appName)), 0);
   }
 
   getAppStakesTotal() {
@@ -641,37 +684,36 @@ class DB {
   }
 
   // TODO(platfowner): Define error code explicitly.
-  // TODO(platfowner): Consider making set operation and native function run tightly bound, i.e.,
-  //                   revert the former if the latter fails.
   // TODO(platfowner): Apply .shard (isWritablePathWithSharding()) to setFunction(), setRule(),
   //                   and setOwner() as well.
-  setValue(valuePath, value, auth, timestamp, transaction, isGlobal) {
+  setValue(valuePath, value, auth, timestamp, transaction, options) {
+    const isGlobal = options && options.isGlobal;
     const isValidObj = isValidJsObjectForStates(value);
     if (!isValidObj.isValid) {
-      return CommonUtil.returnTxResult(101, `Invalid object for states: ${isValidObj.invalidPath}`);
+      return CommonUtil.returnTxResult(101, `Invalid object for states: ${isValidObj.invalidPath}`, 1);
     }
     const parsedPath = CommonUtil.parsePath(valuePath);
     const isValidPath = isValidPathForStates(parsedPath);
     if (!isValidPath.isValid) {
-      return CommonUtil.returnTxResult(102, `Invalid path: ${isValidPath.invalidPath}`);
+      return CommonUtil.returnTxResult(102, `Invalid path: ${isValidPath.invalidPath}`, 1);
     }
-    const localPath = isGlobal === true ? DB.toLocalPath(parsedPath, this.shardingPath) : parsedPath;
+    const localPath = isGlobal ? DB.toLocalPath(parsedPath, this.shardingPath) : parsedPath;
     if (localPath === null) {
       // There is nothing to do.
-      return CommonUtil.returnTxResult(0);
+      return CommonUtil.returnTxResult(0, null, 1);
     }
     if (!this.getPermissionForValue(localPath, value, auth, timestamp)) {
-      return CommonUtil.returnTxResult(103, `No .write permission on: ${valuePath}`);
+      return CommonUtil.returnTxResult(103, `No write permission on: ${valuePath}`, 1);
     }
     const fullPath = DB.getFullPath(localPath, PredefinedDbPaths.VALUES_ROOT);
     const isWritablePath = isWritablePathWithSharding(fullPath, this.stateRoot);
     if (!isWritablePath.isValid) {
       if (isGlobal) {
         // There is nothing to do.
-        return CommonUtil.returnTxResult(0);
+        return CommonUtil.returnTxResult(0, null, 1);
       } else {
         return CommonUtil.returnTxResult(
-            104, `Non-writable path with shard config: ${isWritablePath.invalidPath}`);
+            104, `Non-writable path with shard config: ${isWritablePath.invalidPath}`, 1);
       }
     }
     const valueCopy = CommonUtil.isDict(value) ? JSON.parse(JSON.stringify(value)) : value;
@@ -686,57 +728,59 @@ class DB {
     return CommonUtil.returnTxResult(0, null, 1, funcResults);
   }
 
-  incValue(valuePath, delta, auth, timestamp, transaction, isGlobal) {
-    const valueBefore = this.getValue(valuePath, false, isGlobal);
+  incValue(valuePath, delta, auth, timestamp, transaction, options) {
+    const isGlobal = options && options.isGlobal;
+    const valueBefore = this.getValue(valuePath, { isShallow: false, isGlobal });
     logger.debug(`VALUE BEFORE:  ${JSON.stringify(valueBefore)}`);
-    if ((valueBefore && typeof valueBefore !== 'number') || typeof delta !== 'number') {
-      return CommonUtil.returnTxResult(201, `Not a number type: ${valueBefore} or ${delta}`);
+    if ((valueBefore !== null && !CommonUtil.isNumber(valueBefore)) || !CommonUtil.isNumber(delta)) {
+      return CommonUtil.returnTxResult(201, `Not a number type: ${valueBefore} or ${delta}`, 1);
     }
-    const valueAfter = (valueBefore === undefined ? 0 : valueBefore) + delta;
-    return this.setValue(valuePath, valueAfter, auth, timestamp, transaction, isGlobal);
+    const valueAfter = CommonUtil.numberOrZero(valueBefore) + delta;
+    return this.setValue(valuePath, valueAfter, auth, timestamp, transaction, options);
   }
 
-  decValue(valuePath, delta, auth, timestamp, transaction, isGlobal) {
-    const valueBefore = this.getValue(valuePath, false, isGlobal);
+  decValue(valuePath, delta, auth, timestamp, transaction, options) {
+    const isGlobal = options && options.isGlobal;
+    const valueBefore = this.getValue(valuePath, { isShallow: false, isGlobal });
     logger.debug(`VALUE BEFORE:  ${JSON.stringify(valueBefore)}`);
-    if ((valueBefore && typeof valueBefore !== 'number') || typeof delta !== 'number') {
-      return CommonUtil.returnTxResult(301, `Not a number type: ${valueBefore} or ${delta}`);
+    if ((valueBefore !== null && !CommonUtil.isNumber(valueBefore)) || !CommonUtil.isNumber(delta)) {
+      return CommonUtil.returnTxResult(301, `Not a number type: ${valueBefore} or ${delta}`, 1);
     }
-    const valueAfter = (valueBefore === undefined ? 0 : valueBefore) - delta;
-    return this.setValue(valuePath, valueAfter, auth, timestamp, transaction, isGlobal);
+    const valueAfter = CommonUtil.numberOrZero(valueBefore) - delta;
+    return this.setValue(valuePath, valueAfter, auth, timestamp, transaction, options);
   }
 
-  setFunction(functionPath, func, auth, isGlobal) {
+  setFunction(functionPath, func, auth, options) {
+    const isGlobal = options && options.isGlobal;
     const isValidObj = isValidJsObjectForStates(func);
     if (!isValidObj.isValid) {
-      return CommonUtil.returnTxResult(401, `Invalid object for states: ${isValidObj.invalidPath}`);
+      return CommonUtil.returnTxResult(401, `Invalid object for states: ${isValidObj.invalidPath}`, 1);
     }
     const isValidFunction = isValidFunctionTree(func);
     if (!isValidFunction.isValid) {
-      return CommonUtil.returnTxResult(405, `Invalid function tree: ${isValidFunction.invalidPath}`);
+      return CommonUtil.returnTxResult(405, `Invalid function tree: ${isValidFunction.invalidPath}`, 1);
     }
     const parsedPath = CommonUtil.parsePath(functionPath);
     const isValidPath = isValidPathForStates(parsedPath);
     if (!isValidPath.isValid) {
-      return CommonUtil.returnTxResult(402, `Invalid path: ${isValidPath.invalidPath}`);
+      return CommonUtil.returnTxResult(402, `Invalid path: ${isValidPath.invalidPath}`, 1);
     }
     if (!auth || auth.addr !== this.ownerAddress) {
       const ownerOnlyFid = this.func.hasOwnerOnlyFunction(func);
       if (ownerOnlyFid !== null) {
         return CommonUtil.returnTxResult(
-            403, `Trying to write owner-only function: ${ownerOnlyFid}`);
+            403, `Trying to write owner-only function: ${ownerOnlyFid}`, 1);
       }
     }
-    const localPath = isGlobal === true ?
-        DB.toLocalPath(parsedPath, this.shardingPath) : parsedPath;
+    const localPath = isGlobal ? DB.toLocalPath(parsedPath, this.shardingPath) : parsedPath;
     if (localPath === null) {
       // There is nothing to do.
-      return CommonUtil.returnTxResult(0);
+      return CommonUtil.returnTxResult(0, null, 1);
     }
     if (!this.getPermissionForFunction(localPath, auth)) {
-      return CommonUtil.returnTxResult(404, `No write_function permission on: ${functionPath}`);
+      return CommonUtil.returnTxResult(404, `No write_function permission on: ${functionPath}`, 1);
     }
-    const curFunction = this.getFunction(functionPath, false, isGlobal);
+    const curFunction = this.getFunction(functionPath, { isShallow: false, isGlobal });
     const newFunction = applyFunctionChange(curFunction, func);
     const fullPath = DB.getFullPath(localPath, PredefinedDbPaths.FUNCTIONS_ROOT);
     this.writeDatabase(fullPath, newFunction);
@@ -745,27 +789,28 @@ class DB {
 
   // TODO(platfowner): Add rule config sanitization logic (e.g. dup path variables,
   //                   multiple path variables).
-  setRule(rulePath, rule, auth, isGlobal) {
+  setRule(rulePath, rule, auth, options) {
+    const isGlobal = options && options.isGlobal;
     const isValidObj = isValidJsObjectForStates(rule);
     if (!isValidObj.isValid) {
-      return CommonUtil.returnTxResult(501, `Invalid object for states: ${isValidObj.invalidPath}`);
+      return CommonUtil.returnTxResult(501, `Invalid object for states: ${isValidObj.invalidPath}`, 1);
     }
     const isValidRule = isValidRuleTree(rule);
     if (!isValidRule.isValid) {
-      return CommonUtil.returnTxResult(504, `Invalid rule tree: ${isValidRule.invalidPath}`);
+      return CommonUtil.returnTxResult(504, `Invalid rule tree: ${isValidRule.invalidPath}`, 1);
     }
     const parsedPath = CommonUtil.parsePath(rulePath);
     const isValidPath = isValidPathForStates(parsedPath);
     if (!isValidPath.isValid) {
-      return CommonUtil.returnTxResult(502, `Invalid path: ${isValidPath.invalidPath}`);
+      return CommonUtil.returnTxResult(502, `Invalid path: ${isValidPath.invalidPath}`, 1);
     }
-    const localPath = isGlobal === true ? DB.toLocalPath(parsedPath, this.shardingPath) : parsedPath;
+    const localPath = isGlobal ? DB.toLocalPath(parsedPath, this.shardingPath) : parsedPath;
     if (localPath === null) {
       // There is nothing to do.
-      return CommonUtil.returnTxResult(0);
+      return CommonUtil.returnTxResult(0, null, 1);
     }
     if (!this.getPermissionForRule(localPath, auth)) {
-      return CommonUtil.returnTxResult(503, `No write_rule permission on: ${rulePath}`);
+      return CommonUtil.returnTxResult(503, `No write_rule permission on: ${rulePath}`, 1);
     }
     const fullPath = DB.getFullPath(localPath, PredefinedDbPaths.RULES_ROOT);
     const ruleCopy = CommonUtil.isDict(rule) ? JSON.parse(JSON.stringify(rule)) : rule;
@@ -773,30 +818,31 @@ class DB {
     return CommonUtil.returnTxResult(0, null, 1);
   }
 
-  setOwner(ownerPath, owner, auth, isGlobal) {
+  setOwner(ownerPath, owner, auth, options) {
+    const isGlobal = options && options.isGlobal;
     const isValidObj = isValidJsObjectForStates(owner);
     if (!isValidObj.isValid) {
-      return CommonUtil.returnTxResult(601, `Invalid object for states: ${isValidObj.invalidPath}`);
+      return CommonUtil.returnTxResult(601, `Invalid object for states: ${isValidObj.invalidPath}`, 1);
     }
     const isValidOwner = isValidOwnerTree(owner);
     if (!isValidOwner.isValid) {
-      return CommonUtil.returnTxResult(604, `Invalid owner tree: ${isValidOwner.invalidPath}`);
+      return CommonUtil.returnTxResult(604, `Invalid owner tree: ${isValidOwner.invalidPath}`, 1);
     }
     const parsedPath = CommonUtil.parsePath(ownerPath);
     const isValidPath = isValidPathForStates(parsedPath);
     if (!isValidPath.isValid) {
-      return CommonUtil.returnTxResult(602, `Invalid path: ${isValidPath.invalidPath}`);
+      return CommonUtil.returnTxResult(602, `Invalid path: ${isValidPath.invalidPath}`, 1);
     }
-    const localPath = isGlobal === true ? DB.toLocalPath(parsedPath, this.shardingPath) : parsedPath;
+    const localPath = isGlobal ? DB.toLocalPath(parsedPath, this.shardingPath) : parsedPath;
     if (localPath === null) {
       // There is nothing to do.
-      return CommonUtil.returnTxResult(0);
+      return CommonUtil.returnTxResult(0, null, 1);
     }
     if (!this.getPermissionForOwner(localPath, auth)) {
       return CommonUtil.returnTxResult(
-          603, `No write_owner or branch_owner permission on: ${ownerPath}`);
+          603, `No write_owner or branch_owner permission on: ${ownerPath}`, 1);
     }
-    const curOwner = this.getOwner(ownerPath, false, isGlobal);
+    const curOwner = this.getOwner(ownerPath, { isShallow: false, isGlobal });
     const newOwner = applyOwnerChange(curOwner, owner);
     const fullPath = DB.getFullPath(localPath, PredefinedDbPaths.OWNERS_ROOT);
     this.writeDatabase(fullPath, newOwner);
@@ -847,35 +893,35 @@ class DB {
     switch (op.type) {
       case undefined:
       case WriteDbOperations.SET_VALUE:
-        result = this.setValue(op.ref, op.value, auth, timestamp, tx, op.is_global);
+        result = this.setValue(op.ref, op.value, auth, timestamp, tx, CommonUtil.toSetOptions(op));
         break;
       case WriteDbOperations.INC_VALUE:
-        result = this.incValue(op.ref, op.value, auth, timestamp, tx, op.is_global);
+        result = this.incValue(op.ref, op.value, auth, timestamp, tx, CommonUtil.toSetOptions(op));
         break;
       case WriteDbOperations.DEC_VALUE:
-        result = this.decValue(op.ref, op.value, auth, timestamp, tx, op.is_global);
+        result = this.decValue(op.ref, op.value, auth, timestamp, tx, CommonUtil.toSetOptions(op));
         break;
       case WriteDbOperations.SET_FUNCTION:
-        result = this.setFunction(op.ref, op.value, auth, op.is_global);
+        result = this.setFunction(op.ref, op.value, auth, CommonUtil.toSetOptions(op));
         break;
       case WriteDbOperations.SET_RULE:
-        result = this.setRule(op.ref, op.value, auth, op.is_global);
+        result = this.setRule(op.ref, op.value, auth, CommonUtil.toSetOptions(op));
         break;
       case WriteDbOperations.SET_OWNER:
-        result = this.setOwner(op.ref, op.value, auth, op.is_global);
+        result = this.setOwner(op.ref, op.value, auth, CommonUtil.toSetOptions(op));
         break;
       default:
-        return CommonUtil.returnTxResult(14, `Invalid operation type: ${op.type}`);
+        return CommonUtil.returnTxResult(14, `Invalid operation type: ${op.type}`, 1);
     }
     return result;
   }
 
   executeMultiSetOperation(opList, auth, timestamp, tx) {
-    const resultList = [];
+    const resultList = {};
     for (let i = 0; i < opList.length; i++) {
       const op = opList[i];
       const result = this.executeSingleSetOperation(op, auth, timestamp, tx);
-      resultList.push(result);
+      resultList[i] = result;
       if (CommonUtil.isFailedTx(result)) {
         break;
       }
@@ -883,44 +929,75 @@ class DB {
     return { result_list: resultList };
   }
 
-  executeOperation(op, auth, timestamp, tx, blockNumber = 0) {
+  static updateGasAmountTotal(tx, gasAmountTotal, executionResult) {
+    gasAmountTotal.bandwidth = CommonUtil.getTotalBandwidthGasAmount(tx.tx_body.operation, executionResult);
+    executionResult.gas_amount_total = gasAmountTotal;
+    tx.setExtraField('gas', gasAmountTotal);
+  }
+
+  executeOperation(op, auth, timestamp, tx) {
+    const gasAmountTotal = {
+      bandwidth: { service: 0 },
+      state: { service: 0 }
+    };
+    const result = {
+      gas_amount_total: gasAmountTotal,
+      gas_cost_total: 0
+    };
     if (!op) {
-      return CommonUtil.returnTxResult(11, `Invalid operation: ${op}`);
+      Object.assign(result, CommonUtil.returnTxResult(11, `Invalid operation: ${op}`, 1));
+      DB.updateGasAmountTotal(tx, gasAmountTotal, result);
+      return result;
     }
     if (tx && auth && auth.addr && !auth.fid) {
       const { nonce, timestamp: accountTimestamp } = this.getAccountNonceAndTimestamp(auth.addr);
       if (tx.tx_body.nonce >= 0 && tx.tx_body.nonce !== nonce) {
-        return CommonUtil.returnTxResult(
-          12, `Invalid nonce (!== ${nonce}) of transaction: ${JSON.stringify(tx)}`);
+        Object.assign(result, CommonUtil.returnTxResult(
+            12, `Invalid nonce: ${tx.tx_body.nonce} !== ${nonce}`, 1));
+        DB.updateGasAmountTotal(tx, gasAmountTotal, result);
+        return result;
       }
       if (tx.tx_body.nonce === -2 && tx.tx_body.timestamp <= accountTimestamp) {
-        return CommonUtil.returnTxResult(
-          13, `Invalid timestamp (<= ${accountTimestamp}) of transaction: ` +
-          `${JSON.stringify(tx)}`);
+        Object.assign(result, CommonUtil.returnTxResult(
+            13, `Invalid timestamp: ${tx.tx_body.timestamp} <= ${accountTimestamp}`, 1));
+        DB.updateGasAmountTotal(tx, gasAmountTotal, result);
+        return result;
       }
     }
-    let result;
+    const allStateUsageBefore = this.getAllStateUsages();
+    const stateUsagePerAppBefore = this.getStateUsagePerApp(op);
     if (op.type === WriteDbOperations.SET) {
-      result = this.executeMultiSetOperation(op.op_list, auth, timestamp, tx);
+      Object.assign(result, this.executeMultiSetOperation(op.op_list, auth, timestamp, tx));
     } else {
-      result = this.executeSingleSetOperation(op, auth, timestamp, tx);
+      Object.assign(result, this.executeSingleSetOperation(op, auth, timestamp, tx));
     }
-    const gasPrice = tx.tx_body.gas_price;
-    const gasAmountTotal = CommonUtil.getTotalGasAmount(tx.tx_body.operation, result);
-    result.gas_amount_total = gasAmountTotal;
-    result.gas_cost_total = 0;
-    // TODO(platfowner): Consider charging gas fee for the failure cases.
+    const stateUsagePerAppAfter = this.getStateUsagePerApp(op);
+    DB.updateGasAmountTotal(tx, gasAmountTotal, result);
     if (!CommonUtil.isFailedTx(result)) {
+      const {
+        [StateInfoProperties.TREE_HEIGHT]: treeHeight,
+        [StateInfoProperties.TREE_SIZE]: treeSize
+      } = this.getStateInfo('/');
+      if (treeHeight > TREE_HEIGHT_LIMIT) {
+        return Object.assign(result, {
+          code: 23,
+          error_message: `Out of tree height limit (${treeHeight} > ${TREE_HEIGHT_LIMIT})`
+        });
+      }
+      if (treeSize > TREE_SIZE_LIMIT) {
+        return Object.assign(result, {
+          code: 24,
+          error_message: `Out of tree size limit (${treeSize} > ${TREE_SIZE_LIMIT})`
+        });
+      }
       // NOTE(platfowner): There is no chance to have invalid gas price as its validity check is
       //                   done in isValidTxBody() when transactions are created.
-      tx.setExtraField('gas', gasAmountTotal);
-      if (blockNumber > 0) {
-        // Use only the service gas amount total
-        result.gas_cost_total = CommonUtil.getTotalGasCost(gasPrice, gasAmountTotal.service);
-        const collectFeeRes = this.checkBillingAndCollectFee(op, auth, timestamp, tx, blockNumber, result);
-        if (collectFeeRes !== true) {
-          return collectFeeRes;
-        }
+      const allStateUsageAfter = this.getAllStateUsages();
+      DB.updateStateGasAmount(
+          tx, result, allStateUsageBefore, allStateUsageAfter, stateUsagePerAppBefore, stateUsagePerAppAfter);
+      const stateGasBudgetCheck = this.checkStateGasBudgets(op, allStateUsageAfter.apps, allStateUsageAfter.service, result);
+      if (stateGasBudgetCheck !== true) {
+        return stateGasBudgetCheck;
       }
       if (tx && auth && auth.addr && !auth.fid) {
         this.updateAccountNonceAndTimestamp(auth.addr, tx.tx_body.nonce, tx.tx_body.timestamp);
@@ -929,50 +1006,284 @@ class DB {
     return result;
   }
 
-  checkBillingAndCollectFee(op, auth, timestamp, tx, blockNumber, result) {
-    if (result.gas_cost_total <= 0) { // No fees to collect
-      return true;
+  static updateStateGasAmount(tx, result, allStateUsageBefore, allStateUsageAfter, stateUsagePerAppBefore, stateUsagePerAppAfter) {
+    const LOG_HEADER = 'updateStateGasAmounts';
+    const serviceTreeBytesDelta =
+        _.get(allStateUsageAfter, `service.${StateInfoProperties.TREE_BYTES}`, 0) -
+        _.get(allStateUsageBefore, `service.${StateInfoProperties.TREE_BYTES}`, 0);
+    const appStateGasAmount = Object.keys(stateUsagePerAppAfter).reduce((acc, appName) => {
+      const delta = stateUsagePerAppAfter[appName][StateInfoProperties.TREE_BYTES] -
+          stateUsagePerAppBefore[appName][StateInfoProperties.TREE_BYTES];
+      if (delta > 0) {
+        acc[appName] = delta * STATE_GAS_COEFFICIENT;
+      }
+      return acc;
+    }, {});
+    const stateGasAmount = {
+      service: Math.max(serviceTreeBytesDelta, 0) * STATE_GAS_COEFFICIENT
+    };
+    if (!CommonUtil.isEmpty(appStateGasAmount)) {
+      stateGasAmount.app = appStateGasAmount;
+    }
+    logger.debug(`[${LOG_HEADER}] stateGasAmount: ${JSON.stringify(stateGasAmount, null, 2)}`);
+    CommonUtil.setJsObject(result, ['gas_amount_total', 'state'], stateGasAmount);
+    const txGas = _.get(tx, 'extra.gas', { bandwidth: { service: 0 } });
+    CommonUtil.setJsObject(txGas, ['state'], stateGasAmount);
+    tx.setExtraField('gas', txGas);
+  }
+
+  // TODO(liayoo): reduce computation by remembering & reusing the computed values.
+  getStateFreeTierUsage() {
+    const usage = {};
+    const apps = DB.getValueFromStateRoot(this.stateRoot, PredefinedDbPaths.APPS, true) || {};
+    for (const appName of Object.keys(apps)) {
+      if (!DB.getValueFromStateRoot(
+          this.stateRoot,
+          `/${PredefinedDbPaths.STAKING}/${appName}/${PredefinedDbPaths.STAKING_BALANCE_TOTAL}`)) {
+        CommonUtil.mergeNumericJsObjects(
+            usage, this.getStateUsageAtPath(`${PredefinedDbPaths.APPS}/${appName}`));
+      }
+    }
+    return usage;
+  }
+
+  getStateUsageAtPath(path) {
+    if (!path || path === '/') {
+      return this.getStateInfo('/');
+    }
+    const usageList = [
+      this.getStateInfo(`/${PredefinedDbPaths.VALUES_ROOT}/${path}`),
+      this.getStateInfo(`/${PredefinedDbPaths.RULES_ROOT}/${path}`),
+      this.getStateInfo(`/${PredefinedDbPaths.FUNCIONS_ROOT}/${path}`),
+      this.getStateInfo(`/${PredefinedDbPaths.OWNERS_ROOT}/${path}`)
+    ];
+    const usage = usageList.reduce((acc, cur) => {
+      CommonUtil.mergeNumericJsObjects(acc, cur);
+      return acc;
+    }, {});
+    delete usage[StateInfoProperties.VERSION];
+    delete usage[StateInfoProperties.PROOF_HASH];
+    return usage;
+  }
+
+  getAllStateUsages() {
+    const root = this.getStateUsageAtPath('/');
+    const apps = this.getStateUsageAtPath(PredefinedDbPaths.APPS);
+    const service = {
+      [StateInfoProperties.TREE_BYTES]: root[StateInfoProperties.TREE_BYTES] - apps[StateInfoProperties.TREE_BYTES],
+      [StateInfoProperties.TREE_SIZE]: root[StateInfoProperties.TREE_SIZE] - apps[StateInfoProperties.TREE_SIZE]
+    };
+    return { root, apps, service };
+  }
+
+  getStateUsagePerApp(op) {
+    const appNameList = CommonUtil.getAppNameList(op, this.shardingPath);
+    return appNameList.reduce((acc, appName) => {
+      acc[appName] = this.getStateUsageAtPath(`${PredefinedDbPaths.APPS}/${appName}`);
+      return acc;
+    }, {});
+  }
+
+  checkStateGasBudgets(op, allAppsStateUsage, serviceStateUsage, result) {
+    if (serviceStateUsage[StateInfoProperties.TREE_BYTES] > SERVICE_STATE_BUDGET) {
+      return Object.assign(result, {
+          code: 25,
+          error_message: `Exceeded state budget limit for services ` +
+            `(${serviceStateUsage[StateInfoProperties.TREE_BYTES]} > ${SERVICE_STATE_BUDGET})`
+      });
+    }
+    if (allAppsStateUsage[StateInfoProperties.TREE_BYTES] > APPS_STATE_BUDGET) {
+      return Object.assign(result, {
+          code: 26,
+          error_message: `Exceeded state budget limit for apps ` +
+            `(${allAppsStateUsage[StateInfoProperties.TREE_BYTES]} > ${APPS_STATE_BUDGET})`
+      });
+    }
+    if (serviceStateUsage[StateInfoProperties.TREE_SIZE] > SERVICE_TREE_SIZE_BUDGET) {
+      return Object.assign(result, {
+          code: 27,
+          error_message: `Exceeded state tree size limit for services ` +
+            `(${serviceStateUsage[StateInfoProperties.TREE_SIZE]} > ${SERVICE_TREE_SIZE_BUDGET})`
+      });
+    }
+    if (allAppsStateUsage[StateInfoProperties.TREE_SIZE] > APPS_TREE_SIZE_BUDGET) {
+      return Object.assign(result, {
+          code: 28,
+          error_message: `Exceeded state tree size limit for apps ` +
+            `(${allAppsStateUsage[StateInfoProperties.TREE_SIZE]} > ${APPS_TREE_SIZE_BUDGET})`
+      });
     }
+    const stateFreeTierUsage = this.getStateFreeTierUsage();
+    const freeTierTreeBytesLimitReached = stateFreeTierUsage[StateInfoProperties.TREE_BYTES] >= FREE_STATE_BUDGET;
+    const freeTierTreeSizeLimitReached = stateFreeTierUsage[StateInfoProperties.TREE_SIZE] >= FREE_TREE_SIZE_BUDGET;
+    const appStakesTotal = this.getAppStakesTotal();
+    for (const appName of CommonUtil.getAppNameList(op, this.shardingPath)) {
+      const appStateUsage = this.getStateUsageAtPath(`${PredefinedDbPaths.APPS}/${appName}`);
+      const appStake = this.getAppStake(appName);
+      if (appStake === 0) {
+        if (freeTierTreeBytesLimitReached) {
+          return Object.assign(result, {
+              code: 29,
+              error_message: `Exceeded state budget limit for free tier ` +
+                `(${stateFreeTierUsage[StateInfoProperties.TREE_BYTES]} > ${FREE_STATE_BUDGET})`
+          });
+        }
+        if (freeTierTreeSizeLimitReached) {
+          return Object.assign(result, {
+            code: 30,
+            error_message: `Exceeded state tree size limit for free tier ` +
+              `(${stateFreeTierUsage[StateInfoProperties.TREE_SIZE]} > ${FREE_TREE_SIZE_BUDGET})`
+          });
+        }
+        // else, we allow apps without stakes
+      } else {
+        const appStateBudget = APPS_STATE_BUDGET * appStake / appStakesTotal;
+        const appTreeSizeBudget = APPS_TREE_SIZE_BUDGET * appStake / appStakesTotal;
+        if (appStateUsage[StateInfoProperties.TREE_BYTES] > appStateBudget) {
+          return Object.assign(result, {
+              code: 31,
+              error_message: `Exceeded state budget limit for app ${appName} ` +
+                `(${appStateUsage[StateInfoProperties.TREE_BYTES]} > ${appStateBudget})`
+          });
+        }
+        if (appStateUsage[StateInfoProperties.TREE_SIZE] > appTreeSizeBudget) {
+          return Object.assign(result, {
+              code: 32,
+              error_message: `Exceeded state tree size limit for app ${appName} ` +
+                `(${appStateUsage[StateInfoProperties.TREE_SIZE]} > ${appTreeSizeBudget})`
+          });
+        }
+      }
+    }
+    return true;
+  }
 
+  collectFee(auth, timestamp, tx, blockNumber, executionResult) {
+    const gasPrice = tx.tx_body.gas_price;
+    // Use only the service gas amount total
+    const serviceBandwidthGasAmount = _.get(tx, 'extra.gas.bandwidth.service', 0);
+    const serviceStateGasAmount = _.get(tx, 'extra.gas.state.service', 0);
+    let gasAmountChargedByTransfer = serviceBandwidthGasAmount +
+        (CommonUtil.isFailedTx(executionResult) ? 0 : serviceStateGasAmount);
+    if (gasAmountChargedByTransfer <= 0 || gasPrice === 0) { // No fees to collect
+      executionResult.gas_amount_charged = gasAmountChargedByTransfer;
+      executionResult.gas_cost_total = CommonUtil.getTotalGasCost(gasPrice, gasAmountChargedByTransfer);
+      return;
+    }
     const billing = tx.tx_body.billing;
-    if (!billing) { // Charge the individual account
-      return this.collectFee(auth.addr, result.gas_cost_total, auth, timestamp, tx, blockNumber);
+    let billedTo = billing ? CommonUtil.toBillingAccountName(billing) : auth.addr;
+    if (billing) {
+      const billingParsed = CommonUtil.parseServAcntName(billing);
+      if (!this.isBillingUser(billingParsed[0], billingParsed[1], auth.addr)) {
+        // No longer in the billing users list. Charge the tx signer instead
+        billedTo = auth.addr;
+      }
+    }
+    let balance = this.getBalance(billedTo);
+    const gasCost = CommonUtil.getTotalGasCost(gasPrice, gasAmountChargedByTransfer);
+    if (balance < gasCost) {
+      Object.assign(executionResult, {
+        code: 36,
+        error_message: `Failed to collect gas fee: balance too low (${balance} / ${gasCost})`
+      });
+      this.restoreDb(); // Revert changes made by the tx operations
+      balance = this.getBalance(billedTo);
+      gasAmountChargedByTransfer = Math.min(balance, serviceBandwidthGasAmount);
+    }
+    executionResult.gas_amount_charged = gasAmountChargedByTransfer;
+    executionResult.gas_cost_total = CommonUtil.getTotalGasCost(gasPrice, executionResult.gas_amount_charged);
+    if (executionResult.gas_cost_total <= 0) return;
+    const gasFeeCollectPath = PathUtil.getGasFeeCollectPath(billedTo, blockNumber, tx.hash);
+    const gasFeeCollectRes = this.setValue(
+        gasFeeCollectPath, { amount: executionResult.gas_cost_total }, auth, timestamp, tx);
+    if (CommonUtil.isFailedTx(gasFeeCollectRes)) { // Should not happend
+      Object.assign(executionResult, {
+        code: 18,
+        error_message: `Failed to collect gas fee: ${JSON.stringify(gasFeeCollectRes, null, 2)}`
+      });
     }
-    const billingParsed = billing.split('|');
-    if (billingParsed.length !== 2) {
-      const reason = 'Invalid billing param';
-      return CommonUtil.returnTxResult(15, `Failed to collect gas fee: ${reason}`, 0);
+  }
+
+  recordReceipt(auth, tx, blockNumber, executionResult) {
+    const receiptPath = PathUtil.getReceiptPath(tx.hash);
+    const receipt = {
+      [PredefinedDbPaths.RECEIPTS_ADDRESS]: auth.addr,
+      [PredefinedDbPaths.RECEIPTS_BLOCK_NUMBER]: blockNumber,
+      [PredefinedDbPaths.RECEIPTS_EXEC_RESULT]: executionResult
+    };
+    if (tx.tx_body.billing) {
+      receipt[PredefinedDbPaths.RECEIPTS_BILLING] = tx.tx_body.billing;
+    }
+    // NOTE(liayoo): necessary balance & permission checks have been done in precheckTransaction()
+    //               and collectFee().
+    this.writeDatabase([PredefinedDbPaths.VALUES_ROOT, ...CommonUtil.parsePath(receiptPath)], receipt);
+  }
+
+  isBillingUser(billingAppName, billingId, userAddr) {
+    return this.getValue(
+        PathUtil.getManageAppBillingUsersPath(billingAppName, billingId) + '/' + userAddr) === true;
+  }
+
+  precheckTxBillingParams(op, addr, billing, blockNumber) {
+    const LOG_HEADER = 'precheckTxBillingParams';
+    if (!billing || blockNumber === 0) {
+      return true;
+    }
+    const billingParsed = CommonUtil.parseServAcntName(billing);
+    if (billingParsed[0] === null || billingParsed[1] === null || billingParsed[2] !== null) {
+      return CommonUtil.logAndReturnTxResult(logger, 15, `[${LOG_HEADER}] Invalid billing param`);
+    }
+    if (!this.isBillingUser(billingParsed[0], billingParsed[1], addr)) {
+      return CommonUtil.logAndReturnTxResult(
+        logger, 33, `[${LOG_HEADER}] User doesn't have permission to the billing account`);
     }
-    const billingAppName = billingParsed[0];
-    const billingServiceAcntName = CommonUtil.toBillingAccountName(billing);
     const appNameList = CommonUtil.getServiceDependentAppNameList(op);
     if (appNameList.length > 1) {
       // More than 1 apps are involved. Cannot charge an app-related billing account.
-      const reason = 'Multiple app-dependent service operations for a billing account';
-      return CommonUtil.returnTxResult(16, `Failed to collect gas fee: ${reason}`, 0);
-    } else if (appNameList.length === 1 && appNameList[0] !== billingAppName) {
-      // Tx app name doesn't match the billing account.
-      const reason = 'Invalid billing account';
-      return CommonUtil.returnTxResult(17, `Failed to collect gas fee: ${reason}`, 0);
+      return CommonUtil.logAndReturnTxResult(
+        logger, 16, `[${LOG_HEADER}] Multiple app-dependent service operations for a billing account`);
     }
-    // Either app-independent or app name matches the billing account.
-    return this.collectFee(
-        billingServiceAcntName, result.gas_cost_total, auth, timestamp, tx, blockNumber);
+    if (appNameList.length === 1) {
+      if (appNameList[0] !== billingParsed[0]) {
+        // Tx app name doesn't match the billing account.
+        return CommonUtil.logAndReturnTxResult(logger, 17, `[${LOG_HEADER}] Invalid billing account`);
+      }
+      // App name matches the billing account.
+    }
+    // Tx is app-independent.
+    return true;
   }
 
-  collectFee(billedTo, gasCost, auth, timestamp, tx, blockNumber) {
-    const gasFeeCollectPath = PathUtil.getGasFeeCollectPath(billedTo, blockNumber, tx.hash);
-    const gasFeeCollectRes = this.setValue(
-        gasFeeCollectPath, { amount: gasCost }, auth, timestamp, tx, false);
-    if (CommonUtil.isFailedTx(gasFeeCollectRes)) {
-      return CommonUtil.returnTxResult(
-          18, `Failed to collect gas fee: ${JSON.stringify(gasFeeCollectRes, null, 2)}`, 0);
+  getBalance(addrOrServAcnt) {
+    return this.getValue(CommonUtil.getBalancePath(addrOrServAcnt)) || 0;
+  }
+
+  precheckBalanceAndStakes(op, addr, billing, blockNumber) {
+    const LOG_HEADER = 'precheckBalanceAndStakes';
+    if (blockNumber === 0) {
+      return true;
+    }
+    const billedTo = billing ? CommonUtil.toBillingAccountName(billing) : addr;
+    if (CommonUtil.hasServiceOp(op)) {
+      const balance = this.getBalance(billedTo);
+      if (balance < MIN_BALANCE_FOR_SERVICE_TX) {
+        return CommonUtil.logAndReturnTxResult(
+          logger, 34, `[${LOG_HEADER}] Balance too low (${balance} < ${MIN_BALANCE_FOR_SERVICE_TX})`);
+      }
     }
+    const appNameList = CommonUtil.getAppNameList(op, this.shardingPath);
+    appNameList.forEach((appName) => {
+      const appStake = this.getAppStake(appName);
+      if (appStake < MIN_STAKING_FOR_APP_TX) {
+        return CommonUtil.logAndReturnTxResult(
+          logger, 35, `[${LOG_HEADER}] App stake too low (${appStake} < ${MIN_STAKING_FOR_APP_TX})`);
+      }
+    });
     return true;
   }
 
-  executeTransaction(tx, blockNumber = 0) {
-    const LOG_HEADER = 'executeTransaction';
+  precheckTransaction(tx, blockNumber) {
+    const LOG_HEADER = 'precheckTransaction';
     // NOTE(platfowner): A transaction needs to be converted to an executable form
     //                   before being executed.
     if (!Transaction.isExecutable(tx)) {
@@ -980,43 +1291,70 @@ class DB {
           logger, 21,
           `[${LOG_HEADER}] Not executable transaction: ${JSON.stringify(tx)}`, 0);
     }
-    // Record when the tx was executed.
-    tx.setExtraField('executed_at', Date.now());
-    const txBody = tx.tx_body;
-    if (!txBody) {
+    if (!tx.tx_body) {
       return CommonUtil.logAndReturnTxResult(
-          logger, 22, `[${LOG_HEADER}] Missing tx_body: ${JSON.stringify(tx, null, 2)}`, 0);
+          logger, 22, `[${LOG_HEADER}] Missing tx_body: ${JSON.stringify(tx)}`, 0);
     }
-    // NOTE(platfowner): It's not allowed for users to send transactions with auth.fid.
-    const executionResult = this.executeOperation(
-        txBody.operation, { addr: tx.address }, txBody.timestamp, tx, blockNumber);
-    const stateInfo = this.getStateInfo('/');
-    if (!CommonUtil.isFailedTx(executionResult)) {
-      const treeHeight = stateInfo[StateInfoProperties.TREE_HEIGHT];
-      if (treeHeight > TREE_HEIGHT_LIMIT) {
-        return CommonUtil.returnTxResult(23, `Out of tree height limit ` +
-            `(${treeHeight} > ${TREE_HEIGHT_LIMIT})`);
+    const billing = tx.tx_body.billing;
+    const op = tx.tx_body.operation;
+    const addr = tx.address;
+    const checkBillingResult = this.precheckTxBillingParams(op, addr, billing, blockNumber);
+    if (checkBillingResult !== true) {
+      return checkBillingResult;
+    }
+    const checkBalanceResult = this.precheckBalanceAndStakes(op, addr, billing, blockNumber);
+    if (checkBalanceResult !== true) {
+      return checkBalanceResult;
+    }
+    return true;
+  }
+
+  executeTransaction(tx, skipFees = false, restoreIfFails = false, blockNumber = 0) {
+    const LOG_HEADER = 'executeTransaction';
+    const precheckResult = this.precheckTransaction(tx, blockNumber);
+    if (precheckResult !== true) {
+      logger.debug(`[${LOG_HEADER}] Pre-check failed`);
+      return precheckResult;
+    }
+    if (restoreIfFails) {
+      if (!this.backupDb()) {
+        return CommonUtil.logAndReturnTxResult(
+          logger, 3, `[${LOG_HEADER}] Failed to backup db for tx: ${tx.hash}`, 0);
       }
-      const treeSize = stateInfo[StateInfoProperties.TREE_SIZE];
-      if (treeSize > TREE_SIZE_LIMIT) {
-        return CommonUtil.returnTxResult(24, `Out of tree size limit ` +
-            `(${treeSize} > ${TREE_SIZE_LIMIT})`);
+    }
+    // Record when the tx was executed.
+    const txBody = tx.tx_body;
+    tx.setExtraField('executed_at', Date.now());
+    // NOTE(platfowner): It's not allowed for users to send transactions with auth.fid.
+    const auth = { addr: tx.address };
+    const timestamp = txBody.timestamp;
+    const executionResult = this.executeOperation(txBody.operation, auth, timestamp, tx, blockNumber);
+    if (CommonUtil.isFailedTx(executionResult)) {
+      if (restoreIfFails) {
+        this.restoreDb();
+      } else {
+        return executionResult;
       }
     }
+    if (!skipFees) {
+      this.collectFee(auth, timestamp, tx, blockNumber, executionResult);
+      this.recordReceipt(auth, tx, blockNumber, executionResult);
+    }
     return executionResult;
   }
 
-  executeTransactionList(txList, blockNumber = 0) {
+  executeTransactionList(txList, skipFees = false, restoreIfFails = false, blockNumber = 0) {
     const LOG_HEADER = 'executeTransactionList';
     const resList = [];
     for (const tx of txList) {
       const executableTx = Transaction.toExecutable(tx);
-      const res = this.executeTransaction(executableTx, blockNumber);
+      const res = this.executeTransaction(executableTx, skipFees, restoreIfFails, blockNumber);
       if (CommonUtil.isFailedTx(res)) {
-        // FIXME: remove the failed transaction from tx pool?
-        logger.error(`[${LOG_HEADER}] tx failed: ${JSON.stringify(executableTx, null, 2)}` +
+        logger.debug(`[${LOG_HEADER}] tx failed: ${JSON.stringify(executableTx, null, 2)}` +
             `\nresult: ${JSON.stringify(res)}`);
-        return false;
+        if (CommonUtil.txPrecheckFailed(res) && !restoreIfFails) { // abort right away
+          return false;
+        }
       }
       resList.push(res);
     }
@@ -1043,7 +1381,7 @@ class DB {
         this.addPathToValue(newValue, matched.matchedValuePath, matched.closestRule.path.length);
     let evalRuleRes = false;
     try {
-      evalRuleRes = !!this.evalRuleString(
+      evalRuleRes = !!this.evalRuleConfig(
         matched.closestRule.config, matched.pathVars, data, newData, auth, timestamp);
       if (!evalRuleRes) {
         logger.debug(`[${LOG_HEADER}] evalRuleRes ${evalRuleRes}, ` +
@@ -1204,7 +1542,7 @@ class DB {
   }
 
   convertPathAndConfig(pathAndConfig, isGlobal) {
-    const path = (isGlobal === true) ? this.toGlobalPath(pathAndConfig.path) : pathAndConfig.path;
+    const path = isGlobal ? this.toGlobalPath(pathAndConfig.path) : pathAndConfig.path;
     return {
       path: CommonUtil.formatPath(path),
       config: pathAndConfig.config,
@@ -1212,9 +1550,9 @@ class DB {
   }
 
   convertFunctionMatch(matched, isGlobal) {
-    const functionPath = (isGlobal === true) ?
+    const functionPath = isGlobal ?
         this.toGlobalPath(matched.matchedFunctionPath) : matched.matchedFunctionPath;
-    const valuePath = (isGlobal === true) ?
+    const valuePath = isGlobal ?
         this.toGlobalPath(matched.matchedValuePath) : matched.matchedValuePath;
     const subtreeFunctions =
         matched.subtreeFunctions.map((entry) => this.convertPathAndConfig(entry, false));
@@ -1346,9 +1684,9 @@ class DB {
   }
 
   convertRuleMatch(matched, isGlobal) {
-    const rulePath = (isGlobal === true) ?
+    const rulePath = isGlobal ?
         this.toGlobalPath(matched.matchedRulePath) : matched.matchedRulePath;
-    const valuePath = (isGlobal === true) ?
+    const valuePath = isGlobal ?
         this.toGlobalPath(matched.matchedValuePath) : matched.matchedValuePath;
     const subtreeRules = matched.subtreeRules.map((entry) =>
       this.convertPathAndConfig(entry, false));
@@ -1371,7 +1709,11 @@ class DB {
   }
 
   // TODO(platfowner): Extend function for auth.fid.
-  evalRuleString(ruleString, pathVars, data, newData, auth, timestamp) {
+  evalRuleConfig(ruleConfig, pathVars, data, newData, auth, timestamp) {
+    if (!CommonUtil.isDict(ruleConfig)) {
+      return false;
+    }
+    const ruleString = ruleConfig[RuleProperties.WRITE];
     if (typeof ruleString === 'boolean') {
       return ruleString;
     } else if (typeof ruleString !== 'string') {
@@ -1433,7 +1775,7 @@ class DB {
   }
 
   convertOwnerMatch(matched, isGlobal) {
-    const ownerPath = (isGlobal === true) ?
+    const ownerPath = isGlobal ?
         this.toGlobalPath(matched.matchedOwnerPath) : matched.matchedOwnerPath;
     return {
       matched_path: {
diff --git a/db/rule-util.js b/db/rule-util.js
index 86eeedfc5..a8cb31efd 100644
--- a/db/rule-util.js
+++ b/db/rule-util.js
@@ -86,10 +86,26 @@ class RuleUtil {
     return value === ShardingProtocols.NONE || value === ShardingProtocols.POA;
   }
 
+  boolOrFalse(value) {
+    return this.isBool(value) ? value : false;
+  }
+
+  numberOrZero(num) {
+    return this.isNumber(num) ? num : 0;
+  }
+
+  stringOrEmpty(str) {
+    return this.isString(str) ? str : '';
+  }
+
   toBool(value) {
     return this.isBool(value) ? value : value === 'true';
   }
 
+  toNumberOrNaN(value) {
+    return this.isNumber(value) ? value : Number(value);
+  }
+
   toCksumAddr(addr) {
     try {
       return ainUtil.toChecksumAddress(addr);
@@ -130,10 +146,15 @@ class RuleUtil {
     return parsed[1];
   }
 
-  getAppAdminPath(accountName) {
+  isAppAdmin(appName, address, getValue) {
     const { PredefinedDbPaths } = require('../common/constants');
+    return getValue(`/${PredefinedDbPaths.MANAGE_APP}/${appName}/${PredefinedDbPaths.MANAGE_APP_CONFIG}/` +
+        `${PredefinedDbPaths.MANAGE_APP_CONFIG_ADMIN}/${address}`) === true;
+  }
+
+  isAppAdminFromServAcntName(accountName, address, getValue) {
     const appName = this.getServiceNameFromServAcntName(accountName);
-    return `/${PredefinedDbPaths.MANAGE_APP}/${appName}/${PredefinedDbPaths.MANAGE_APP_CONFIG}/${PredefinedDbPaths.MANAGE_APP_CONFIG_ADMIN}`;
+    return this.isAppAdmin(appName, address, getValue);
   }
 
   getBalancePath(addrOrServAcnt) {
@@ -146,14 +167,41 @@ class RuleUtil {
     }
   }
 
-  getBillingUserPath(billingServAcntName, userAddr) {
+  getBalance(addrOrServAcnt, getValue) {
+    return getValue(this.getBalancePath(addrOrServAcnt)) || 0;
+  }
+
+  isBillingUser(billingServAcntName, userAddr, getValue) {
     const { PredefinedDbPaths } = require('../common/constants');
     const parsed = this.parseServAcntName(billingServAcntName);
     const appName = parsed[1];
     const billingId = parsed[2];
-    return `/${PredefinedDbPaths.MANAGE_APP}/${appName}/${PredefinedDbPaths.MANAGE_APP_CONFIG}/` +
+    return getValue(
+        `/${PredefinedDbPaths.MANAGE_APP}/${appName}/${PredefinedDbPaths.MANAGE_APP_CONFIG}/` +
         `${PredefinedDbPaths.MANAGE_APP_CONFIG_BILLING}/${billingId}/` +
-        `${PredefinedDbPaths.MANAGE_APP_CONFIG_BILLING_USERS}/${userAddr}`;
+        `${PredefinedDbPaths.MANAGE_APP_CONFIG_BILLING_USERS}/${userAddr}`) === true;
+  }
+
+  isGasFeeCollected(address, newData, txHash, getValue) {
+    const { PredefinedDbPaths } = require('../common/constants');
+    const blockNumber = newData[PredefinedDbPaths.RECEIPTS_BLOCK_NUMBER];
+    const gasCost = _.get(newData, `${PredefinedDbPaths.RECEIPTS_EXEC_RESULT}.${PredefinedDbPaths.RECEIPTS_GAS_COST_TOTAL}`);
+    if (gasCost === undefined) {
+      return false;
+    }
+    const billing = _.get(newData, `${PredefinedDbPaths.RECEIPTS_BILLING}`);
+    const collectedFrom = billing ? `${PredefinedDbPaths.BILLING}|${billing}` : address;
+    const feeCollected = getValue(
+        `/${PredefinedDbPaths.GAS_FEE}/${PredefinedDbPaths.COLLECT}/${collectedFrom}` +
+        `/${blockNumber}/${txHash}/${PredefinedDbPaths.GAS_FEE_AMOUNT}`) || 0;
+    return feeCollected === gasCost;
+  }
+
+  getConsensusStakeBalance(address, getValue) {
+    const { PredefinedDbPaths } = require('../common/constants');
+    return getValue(
+        `/${PredefinedDbPaths.SERVICE_ACCOUNTS}/${PredefinedDbPaths.STAKING}/` +
+        `${PredefinedDbPaths.CONSENSUS}/${address}|0/${PredefinedDbPaths.BALANCE}`) || 0;
   }
 
   getOwnerAddr() {
@@ -166,6 +214,11 @@ class RuleUtil {
     return MIN_STAKE_PER_VALIDATOR;
   }
 
+  getMaxStakeAmount() {
+    const { MAX_STAKE_PER_VALIDATOR } = require('../common/constants');
+    return MAX_STAKE_PER_VALIDATOR;
+  }
+
   getMinNumValidators() {
     const { MIN_NUM_VALIDATORS } = require('../common/constants');
     return MIN_NUM_VALIDATORS;
diff --git a/db/state-node.js b/db/state-node.js
index 1bc3c4809..e629c2f0b 100644
--- a/db/state-node.js
+++ b/db/state-node.js
@@ -1,9 +1,14 @@
 const logger = require('../logger')('STATE_NODE');
 
+const sizeof = require('object-sizeof');
 const CommonUtil = require('../common/common-util');
-const { HASH_DELIMITER } = require('../common/constants');
+const {
+  HASH_DELIMITER,
+  StateInfoProperties,
+} = require('../common/constants');
 
 class StateNode {
+  // NOTE(seo): Once new member variables are added, computeNodeBytes() should be updated.
   constructor(version) {
     this.version = version || null;
     this.isLeaf = true;
@@ -13,23 +18,25 @@ class StateNode {
     // Used for leaf nodes only.
     this.value = null;
     this.proofHash = null;
-    this.treeHeight = null;
-    this.treeSize = null;
+    this.treeHeight = 0;
+    this.treeSize = 0;
+    this.treeBytes = 0;
   }
 
-  static _create(version, isLeaf, value, proofHash, treeHeight, treeSize) {
+  static _create(version, isLeaf, value, proofHash, treeHeight, treeSize, treeBytes) {
     const node = new StateNode(version);
     node.setIsLeaf(isLeaf);
     node.setValue(value);
     node.setProofHash(proofHash);
     node.setTreeHeight(treeHeight);
     node.setTreeSize(treeSize);
+    node.setTreeBytes(treeBytes);
     return node;
   }
 
   clone(version) {
     const cloned = StateNode._create(version ? version : this.version,
-        this.isLeaf, this.value, this.proofHash, this.treeHeight, this.treeSize);
+        this.isLeaf, this.value, this.proofHash, this.treeHeight, this.treeSize, this.treeBytes);
     for (const label of this.getChildLabels()) {
       const child = this.getChild(label);
       cloned.setChild(label, child);
@@ -52,7 +59,19 @@ class StateNode {
         that.proofHash === this.proofHash &&
         that.version === this.version &&
         that.treeHeight === this.treeHeight &&
-        that.treeSize === this.treeSize);
+        that.treeSize === this.treeSize &&
+        that.treeBytes === this.treeBytes);
+  }
+
+  // NOTE(liayoo): Bytes for some data (e.g. parents & children references, version) are excluded
+  //               from this calculation, since their sizes can vary and affect the gas costs and state proof hashes.
+  computeNodeBytes() {
+    return sizeof(this.isLeaf) +
+        sizeof(this.value) +
+        sizeof(this.proofHash) +
+        sizeof(this.treeHeight) +
+        sizeof(this.treeSize) +
+        sizeof(this.treeBytes);
   }
 
   static fromJsObject(obj, version) {
@@ -70,45 +89,49 @@ class StateNode {
     return node;
   }
 
-  toJsObject(withDetails) {
+  toJsObject(options) {
+    const isShallow = options && options.isShallow;
+    const includeTreeInfo = options && options.includeTreeInfo;
+    const includeProof = options && options.includeProof;
+    const includeVersion = options && options.includeVersion;
     if (this.getIsLeaf()) {
       return this.getValue();
     }
     const obj = {};
     for (const label of this.getChildLabels()) {
       const childNode = this.getChild(label);
-      obj[label] = childNode.toJsObject(withDetails);
+      obj[label] = isShallow ? true : childNode.toJsObject(options);
       if (childNode.getIsLeaf()) {
-        if (withDetails) {
-          obj[`.version:${label}`] = childNode.getVersion();
-          obj[`.numParents:${label}`] = childNode.numParents();
-          obj[`.proofHash:${label}`] = childNode.getProofHash();
-          obj[`.treeHeight:${label}`] = childNode.getTreeHeight();
-          obj[`.treeSize:${label}`] = childNode.getTreeSize();
+        if (includeTreeInfo) {
+          obj[`.${StateInfoProperties.NUM_PARENTS}:${label}`] = childNode.numParents();
+          obj[`.${StateInfoProperties.TREE_HEIGHT}:${label}`] = childNode.getTreeHeight();
+          obj[`.${StateInfoProperties.TREE_SIZE}:${label}`] = childNode.getTreeSize();
+          obj[`.${StateInfoProperties.TREE_BYTES}:${label}`] = childNode.getTreeBytes();
+        }
+        if (includeProof) {
+          obj[`.${StateInfoProperties.PROOF_HASH}:${label}`] = childNode.getProofHash();
+        }
+        if (includeVersion) {
+          obj[`.${StateInfoProperties.VERSION}:${label}`] = childNode.getVersion();
         }
       }
     }
-    if (withDetails) {
-      obj['.version'] = this.getVersion();
-      obj['.numParents'] = this.numParents();
-      obj[`.proofHash`] = this.getProofHash();
-      obj[`.treeHeight`] = this.getTreeHeight();
-      obj[`.treeSize`] = this.getTreeSize();
+    if (includeTreeInfo) {
+      obj[`.${StateInfoProperties.NUM_PARENTS}`] = this.numParents();
+      obj[`.${StateInfoProperties.TREE_HEIGHT}`] = this.getTreeHeight();
+      obj[`.${StateInfoProperties.TREE_SIZE}`] = this.getTreeSize();
+      obj[`.${StateInfoProperties.TREE_BYTES}`] = this.getTreeBytes();
+    }
+    if (includeProof) {
+      obj[`.${StateInfoProperties.PROOF_HASH}`] = this.getProofHash();
+    }
+    if (includeVersion) {
+      obj[`.${StateInfoProperties.VERSION}`] = this.getVersion();
     }
 
     return obj;
   }
 
-  toJsObjectShallow() {
-    if (this.getIsLeaf()) {
-      return this.getValue();
-    }
-    return this.getChildLabels().reduce((shallowCopy, label) => {
-      shallowCopy[label] = true;
-      return shallowCopy;
-    }, {});
-  }
-
   getIsLeaf() {
     return this.isLeaf;
   }
@@ -259,6 +282,14 @@ class StateNode {
     this.treeSize = treeSize;
   }
 
+  getTreeBytes() {
+    return this.treeBytes;
+  }
+
+  setTreeBytes(treeBytes) {
+    this.treeBytes = treeBytes;
+  }
+
   buildProofHash() {
     let preimage;
     if (this.getIsLeaf()) {
@@ -293,10 +324,22 @@ class StateNode {
     }
   }
 
+  computeTreeBytes() {
+    if (this.getIsLeaf()) {
+      return this.computeNodeBytes();
+    } else {
+      return this.getChildLabels().reduce((acc, label) => {
+        const child = this.getChild(label);
+        return acc + sizeof(label) + CommonUtil.numberOrZero(child.getTreeBytes());
+      }, this.computeNodeBytes());
+    }
+  }
+
   updateProofHashAndStateInfo() {
     this.setProofHash(this.buildProofHash());
     this.setTreeHeight(this.computeTreeHeight());
     this.setTreeSize(this.computeTreeSize());
+    this.setTreeBytes(this.computeTreeBytes());
   }
 }
 
diff --git a/db/state-util.js b/db/state-util.js
index 510003955..3c22f7546 100644
--- a/db/state-util.js
+++ b/db/state-util.js
@@ -5,6 +5,7 @@ const _ = require('lodash');
 const validUrl = require('valid-url');
 const CommonUtil = require('../common/common-util');
 const {
+  PredefinedDbPaths,
   FunctionProperties,
   FunctionTypes,
   isNativeFunctionId,
@@ -28,35 +29,35 @@ function getConfig(node, label) {
 }
 
 function hasShardConfig(valueNode) {
-  return hasConfig(valueNode, ShardingProperties.SHARD);
+  return hasConfig(valueNode, PredefinedDbPaths.DOT_SHARD);
 }
 
 function getShardConfig(valueNode) {
-  return getConfig(valueNode, ShardingProperties.SHARD);
+  return getConfig(valueNode, PredefinedDbPaths.DOT_SHARD);
 }
 
 function hasFunctionConfig(funcNode) {
-  return hasConfig(funcNode, FunctionProperties.FUNCTION);
+  return hasConfig(funcNode, PredefinedDbPaths.DOT_FUNCTION);
 }
 
 function getFunctionConfig(funcNode) {
-  return getConfig(funcNode, FunctionProperties.FUNCTION);
+  return getConfig(funcNode, PredefinedDbPaths.DOT_FUNCTION);
 }
 
 function hasRuleConfig(ruleNode) {
-  return hasConfig(ruleNode, RuleProperties.WRITE);
+  return hasConfig(ruleNode, PredefinedDbPaths.DOT_RULE);
 }
 
 function getRuleConfig(ruleNode) {
-  return getConfig(ruleNode, RuleProperties.WRITE);
+  return getConfig(ruleNode, PredefinedDbPaths.DOT_RULE);
 }
 
 function hasOwnerConfig(ownerNode) {
-  return hasConfig(ownerNode, OwnerProperties.OWNER);
+  return hasConfig(ownerNode, PredefinedDbPaths.DOT_OWNER);
 }
 
 function getOwnerConfig(ownerNode) {
-  return getConfig(ownerNode, OwnerProperties.OWNER);
+  return getConfig(ownerNode, PredefinedDbPaths.DOT_OWNER);
 }
 
 function hasEnabledShardConfig(node) {
@@ -73,7 +74,7 @@ function isWritablePathWithSharding(fullPath, root) {
   const path = [];
   let curNode = root;
   for (const label of fullPath) {
-    if (label !== ShardingProperties.SHARD && hasEnabledShardConfig(curNode)) {
+    if (label !== PredefinedDbPaths.DOT_SHARD && hasEnabledShardConfig(curNode)) {
       isValid = false;
       break;
     }
@@ -169,9 +170,16 @@ function isValidJsObjectForStates(obj) {
  * Checks the validity of the given rule configuration.
  */
  function isValidRuleConfig(ruleConfigObj) {
-  if (!CommonUtil.isBool(ruleConfigObj) && !CommonUtil.isString(ruleConfigObj)) {
+  if (!CommonUtil.isDict(ruleConfigObj)) {
     return { isValid: false, invalidPath: CommonUtil.formatPath([]) };
   }
+  if (!ruleConfigObj.hasOwnProperty(RuleProperties.WRITE)) {
+    return { isValid: false, invalidPath: CommonUtil.formatPath([]) };
+  }
+  const writeProp = ruleConfigObj[RuleProperties.WRITE];
+  if (!CommonUtil.isBool(writeProp) && !CommonUtil.isString(writeProp)) {
+    return { isValid: false, invalidPath: CommonUtil.formatPath([RuleProperties.WRITE]) };
+  }
 
   return { isValid: true, invalidPath: '' };
 }
@@ -284,10 +292,10 @@ function isValidOwnerConfig(ownerConfigObj) {
     return { isValid: false, invalidPath: CommonUtil.formatPath([]) };
   }
   const path = [];
-  const ownersProp = ownerConfigObj[OwnerProperties.OWNERS];
-  if (ownersProp === undefined) {
+  if (!ownerConfigObj.hasOwnProperty(OwnerProperties.OWNERS)) {
     return { isValid: false, invalidPath: CommonUtil.formatPath(path) };
   }
+  const ownersProp = ownerConfigObj[OwnerProperties.OWNERS];
   path.push(OwnerProperties.OWNERS);
   if (!CommonUtil.isDict(ownersProp)) {
     return { isValid: false, invalidPath: CommonUtil.formatPath(path) };
@@ -357,7 +365,7 @@ function isValidRuleTree(ruleTreeObj) {
     return { isValid: true, invalidPath: '' };
   }
 
-  return isValidConfigTreeRecursive(ruleTreeObj, [], RuleProperties.WRITE, isValidRuleConfig);
+  return isValidConfigTreeRecursive(ruleTreeObj, [], PredefinedDbPaths.DOT_RULE, isValidRuleConfig);
 }
 
 /**
@@ -369,7 +377,7 @@ function isValidFunctionTree(functionTreeObj) {
   }
 
   return isValidConfigTreeRecursive(
-      functionTreeObj, [], FunctionProperties.FUNCTION, isValidFunctionConfig);
+      functionTreeObj, [], PredefinedDbPaths.DOT_FUNCTION, isValidFunctionConfig);
 }
 
 /**
@@ -380,7 +388,8 @@ function isValidOwnerTree(ownerTreeObj) {
     return { isValid: true, invalidPath: '' };
   }
 
-  return isValidConfigTreeRecursive(ownerTreeObj, [], OwnerProperties.OWNER, isValidOwnerConfig);
+  return isValidConfigTreeRecursive(
+      ownerTreeObj, [], PredefinedDbPaths.DOT_OWNER, isValidOwnerConfig);
 }
 
 /**
@@ -420,22 +429,22 @@ function hasConfigLabelOnly(stateTreeObj, configLabel) {
 function applyFunctionChange(curFuncTree, functionChange) {
   // NOTE(platfowner): Partial set is applied only when the current function tree has
   // .function property and the function change has .function property as the only property.
-  if (!hasConfigLabel(curFuncTree, FunctionProperties.FUNCTION) ||
-      !hasConfigLabelOnly(functionChange, FunctionProperties.FUNCTION)) {
+  if (!hasConfigLabel(curFuncTree, PredefinedDbPaths.DOT_FUNCTION) ||
+      !hasConfigLabelOnly(functionChange, PredefinedDbPaths.DOT_FUNCTION)) {
     return CommonUtil.isDict(functionChange) ?
         JSON.parse(JSON.stringify(functionChange)) : functionChange;
   }
-  const funcChangeMap = CommonUtil.getJsObject(functionChange, [FunctionProperties.FUNCTION]);
+  const funcChangeMap = CommonUtil.getJsObject(functionChange, [PredefinedDbPaths.DOT_FUNCTION]);
   if (!funcChangeMap || Object.keys(funcChangeMap).length === 0) {
     return curFuncTree;
   }
   const newFuncConfig =
       CommonUtil.isDict(curFuncTree) ? JSON.parse(JSON.stringify(curFuncTree)) : {};
-  let newFuncMap = CommonUtil.getJsObject(newFuncConfig, [FunctionProperties.FUNCTION]);
+  let newFuncMap = CommonUtil.getJsObject(newFuncConfig, [PredefinedDbPaths.DOT_FUNCTION]);
   if (!CommonUtil.isDict(newFuncMap)) {
     // Add a place holder.
-    CommonUtil.setJsObject(newFuncConfig, [FunctionProperties.FUNCTION], {});
-    newFuncMap = CommonUtil.getJsObject(newFuncConfig, [FunctionProperties.FUNCTION]);
+    CommonUtil.setJsObject(newFuncConfig, [PredefinedDbPaths.DOT_FUNCTION], {});
+    newFuncMap = CommonUtil.getJsObject(newFuncConfig, [PredefinedDbPaths.DOT_FUNCTION]);
   }
   for (const functionKey in funcChangeMap) {
     const functionInfo = funcChangeMap[functionKey];
@@ -458,12 +467,12 @@ function applyFunctionChange(curFuncTree, functionChange) {
 function applyOwnerChange(curOwnerTree, ownerChange) {
   // NOTE(platfowner): Partial set is applied only when the current owner tree has
   // .owner property and the owner change has .owner property as the only property.
-  if (!hasConfigLabel(curOwnerTree, OwnerProperties.OWNER) ||
-      !hasConfigLabelOnly(ownerChange, OwnerProperties.OWNER)) {
+  if (!hasConfigLabel(curOwnerTree, PredefinedDbPaths.DOT_OWNER) ||
+      !hasConfigLabelOnly(ownerChange, PredefinedDbPaths.DOT_OWNER)) {
     return CommonUtil.isDict(ownerChange) ?
         JSON.parse(JSON.stringify(ownerChange)) : ownerChange;
   }
-  const ownerMapPath = [OwnerProperties.OWNER, OwnerProperties.OWNERS];
+  const ownerMapPath = [PredefinedDbPaths.DOT_OWNER, OwnerProperties.OWNERS];
   const ownerChangeMap = CommonUtil.getJsObject(ownerChange, ownerMapPath);
   if (!ownerChangeMap || Object.keys(ownerChangeMap).length === 0) {
     return curOwnerTree;
diff --git a/deploy_blockchain_gcp.sh b/deploy_blockchain_genesis_gcp.sh
similarity index 66%
rename from deploy_blockchain_gcp.sh
rename to deploy_blockchain_genesis_gcp.sh
index f798bfdf7..f5ed9d79c 100644
--- a/deploy_blockchain_gcp.sh
+++ b/deploy_blockchain_genesis_gcp.sh
@@ -1,14 +1,14 @@
 #!/bin/sh
 
-if [ "$#" -lt 3 ]; then
-    echo "Usage: sh deploy_blockchain_gcp.sh [dev|staging|spring|summer] <GCP Username> <# of Shards> [--setup]"
-    echo "Example: sh deploy_blockchain_gcp.sh dev lia 0 --setup"
+if [[ "$#" -lt 3 ]]; then
+    echo "Usage: sh deploy_blockchain_genesis_gcp.sh [dev|staging|spring|summer] <GCP Username> <# of Shards> [--setup]"
+    echo "Example: sh deploy_blockchain_genesis_gcp.sh dev lia 0 --setup"
     exit
 fi
 
-if [ "$1" = 'spring' ] || [ "$1" = 'summer' ] || [ "$1" = 'dev' ] || [ "$1" = 'staging' ]; then
+if [[ "$1" = 'spring' ]] || [[ "$1" = 'summer' ]] || [[ "$1" = 'dev' ]] || [[ "$1" = 'staging' ]]; then
     SEASON="$1"
-    if [ "$1" = 'spring' ] || [ "$1" = 'summer' ]; then
+    if [[ "$1" = 'spring' ]] || [[ "$1" = 'summer' ]]; then
         PROJECT_ID="testnet-prod-ground"
     else
         PROJECT_ID="testnet-$1-ground"
@@ -26,6 +26,9 @@ echo "GCP_USER=$GCP_USER"
 NUM_SHARDS=$3
 echo "NUM_SHARDS=$NUM_SHARDS"
 
+OPTIONS="$4"
+echo "OPTIONS=$OPTIONS"
+
 # Get confirmation.
 echo
 read -p "Do you want to proceed? >> (y/N) " -n 1 -r
@@ -36,8 +39,8 @@ then
     [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1 # handle exits from shell or function but don't exit interactive shell
 fi
 
-FILES_FOR_TRACKER="blockchain/ client/ common/ consensus/ db/ genesis-configs/ logger/ tracker-server/ package.json setup_tracker_gcp.sh setup_blockchain_ubuntu.sh start_tracker_gcp.sh"
-FILES_FOR_NODE="blockchain/ client/ common/ consensus/ db/ json_rpc/ genesis-configs/ logger/ node/ tx-pool/ p2p/ package.json setup_node_gcp.sh setup_blockchain_ubuntu.sh start_node_gcp.sh"
+FILES_FOR_TRACKER="blockchain/ client/ common/ consensus/ db/ genesis-configs/ logger/ tracker-server/ package.json setup_blockchain_ubuntu.sh start_tracker_genesis_gcp.sh"
+FILES_FOR_NODE="blockchain/ client/ common/ consensus/ db/ json_rpc/ genesis-configs/ logger/ node/ tx-pool/ p2p/ package.json setup_blockchain_ubuntu.sh start_node_genesis_gcp.sh"
 
 TRACKER_TARGET_ADDR="${GCP_USER}@${SEASON}-tracker-taiwan"
 NODE_0_TARGET_ADDR="${GCP_USER}@${SEASON}-node-0-taiwan"
@@ -61,7 +64,7 @@ gcloud compute ssh $NODE_2_TARGET_ADDR --command "sudo killall node" --project $
 gcloud compute ssh $NODE_3_TARGET_ADDR --command "sudo killall node" --project $PROJECT_ID --zone $NODE_3_ZONE
 gcloud compute ssh $NODE_4_TARGET_ADDR --command "sudo killall node" --project $PROJECT_ID --zone $NODE_4_ZONE
 
-if [ "$NUM_SHARDS" -gt 0 ]; then
+if [[ "$NUM_SHARDS" -gt 0 ]]; then
     for i in $(seq $NUM_SHARDS)
         do
             echo "shard #$i"
@@ -79,22 +82,22 @@ if [ "$NUM_SHARDS" -gt 0 ]; then
 fi
 
 # deploy files to GCP instances
-printf "\nDeploying parent blockchain..."
-printf "\nDeploying files to ${TRACKER_TARGET_ADDR}..."
+printf "\nDeploying parent blockchain...\n\n"
+printf "\nDeploying files to parent tracker (${TRACKER_TARGET_ADDR})...\n\n"
 gcloud compute scp --recurse $FILES_FOR_TRACKER ${TRACKER_TARGET_ADDR}:~/ --project $PROJECT_ID --zone $TRACKER_ZONE
-printf "\nDeploying files to ${NODE_0_TARGET_ADDR}..."
+printf "\nDeploying files to parent node 0 (${NODE_0_TARGET_ADDR})...\n\n"
 gcloud compute scp --recurse $FILES_FOR_NODE ${NODE_0_TARGET_ADDR}:~/ --project $PROJECT_ID --zone $NODE_0_ZONE
-printf "\nDeploying files to ${NODE_1_TARGET_ADDR}..."
+printf "\nDeploying files to parent node 1 (${NODE_1_TARGET_ADDR})...\n\n"
 gcloud compute scp --recurse $FILES_FOR_NODE ${NODE_1_TARGET_ADDR}:~/ --project $PROJECT_ID --zone $NODE_1_ZONE
-printf "\nDeploying files to ${NODE_2_TARGET_ADDR}..."
+printf "\nDeploying files to parent node 2 (${NODE_2_TARGET_ADDR})...\n\n"
 gcloud compute scp --recurse $FILES_FOR_NODE ${NODE_2_TARGET_ADDR}:~/ --project $PROJECT_ID --zone $NODE_2_ZONE
-printf "\nDeploying files to ${NODE_3_TARGET_ADDR}..."
+printf "\nDeploying files to parent node 3 (${NODE_3_TARGET_ADDR})...\n\n"
 gcloud compute scp --recurse $FILES_FOR_NODE ${NODE_3_TARGET_ADDR}:~/ --project $PROJECT_ID --zone $NODE_3_ZONE
-printf "\nDeploying files to ${NODE_4_TARGET_ADDR}..."
+printf "\nDeploying files to parent node 4 (${NODE_4_TARGET_ADDR})...\n\n"
 gcloud compute scp --recurse $FILES_FOR_NODE ${NODE_4_TARGET_ADDR}:~/ --project $PROJECT_ID --zone $NODE_4_ZONE
 
 # ssh into each instance, set up the ubuntu VM instance (ONLY NEEDED FOR THE FIRST TIME)
-if [ "$4" == "--setup" ]; then
+if [[ $OPTIONS = "--setup" ]]; then
     printf "\n\n##########################\n# Setting up parent tracker #\n###########################\n\n"
     gcloud compute ssh $TRACKER_TARGET_ADDR --command ". setup_blockchain_ubuntu.sh" --project $PROJECT_ID --zone $TRACKER_ZONE
     printf "\n\n##########################\n# Setting up parent node 0 #\n##########################\n\n"
@@ -110,27 +113,27 @@ if [ "$4" == "--setup" ]; then
 fi
 
 # ssh into each instance, install packages and start up the server
-printf "\n\n############################\n# Running parent tracker #\n############################\n\n"
-gcloud compute ssh $TRACKER_TARGET_ADDR --command ". setup_tracker_gcp.sh && . start_tracker_gcp.sh" --project $PROJECT_ID --zone $TRACKER_ZONE
-printf "\n\n###########################\n# Running parent node 0 #\n###########################\n\n"
-gcloud compute ssh $NODE_0_TARGET_ADDR --command ". setup_node_gcp.sh && . start_node_gcp.sh $SEASON 0 0" --project $PROJECT_ID --zone $NODE_0_ZONE
-printf "\n\n#########################\n# Running parent node 1 #\n#########################\n\n"
-gcloud compute ssh $NODE_1_TARGET_ADDR --command ". setup_node_gcp.sh && . start_node_gcp.sh $SEASON 0 1" --project $PROJECT_ID --zone $NODE_1_ZONE
-printf "\n\n#########################\n# Running parent node 2 #\n#########################\n\n"
-gcloud compute ssh $NODE_2_TARGET_ADDR --command ". setup_node_gcp.sh && . start_node_gcp.sh $SEASON 0 2" --project $PROJECT_ID --zone $NODE_2_ZONE
-printf "\n\n#########################\n# Running parent node 3 #\n#########################\n\n"
-gcloud compute ssh $NODE_3_TARGET_ADDR --command ". setup_node_gcp.sh && . start_node_gcp.sh $SEASON 0 3" --project $PROJECT_ID --zone $NODE_3_ZONE
-printf "\n\n#########################\n# Running parent node 4 #\n#########################\n\n"
-gcloud compute ssh $NODE_4_TARGET_ADDR --command ". setup_node_gcp.sh && . start_node_gcp.sh $SEASON 0 4" --project $PROJECT_ID --zone $NODE_4_ZONE
-
-if [ "$NUM_SHARDS" -gt 0 ]; then
+printf "\n\n###########################\n# Starting parent tracker #\n###########################\n\n"
+gcloud compute ssh $TRACKER_TARGET_ADDR --command ". start_tracker_genesis_gcp.sh" --project $PROJECT_ID --zone $TRACKER_ZONE
+printf "\n\n##########################\n# Starting parent node 0 #\n##########################\n\n"
+gcloud compute ssh $NODE_0_TARGET_ADDR --command ". start_node_genesis_gcp.sh $SEASON 0 0" --project $PROJECT_ID --zone $NODE_0_ZONE
+printf "\n\n##########################\n# Starting parent node 1 #\n##########################\n\n"
+gcloud compute ssh $NODE_1_TARGET_ADDR --command ". start_node_genesis_gcp.sh $SEASON 0 1" --project $PROJECT_ID --zone $NODE_1_ZONE
+printf "\n\n##########################\n# Starting parent node 2 #\n##########################\n\n"
+gcloud compute ssh $NODE_2_TARGET_ADDR --command ". start_node_genesis_gcp.sh $SEASON 0 2" --project $PROJECT_ID --zone $NODE_2_ZONE
+printf "\n\n##########################\n# Starting parent node 3 #\n##########################\n\n"
+gcloud compute ssh $NODE_3_TARGET_ADDR --command ". start_node_genesis_gcp.sh $SEASON 0 3" --project $PROJECT_ID --zone $NODE_3_ZONE
+printf "\n\n##########################\n# Starting parent node 4 #\n##########################\n\n"
+gcloud compute ssh $NODE_4_TARGET_ADDR --command ". start_node_genesis_gcp.sh $SEASON 0 4" --project $PROJECT_ID --zone $NODE_4_ZONE
+
+if [[ "$NUM_SHARDS" -gt 0 ]]; then
     printf "\nDeploying shard blockchains..."
     for i in $(seq $NUM_SHARDS)
         do
             echo "shard #$i"
 
             # generate genesis config files in ./blockchain/shard_$i
-            if [ "$4" == "--setup" ]; then
+            if [[ $OPTIONS = "--setup" ]]; then
                 node ./tools/generateShardGenesisFiles.js $SEASON 10 $i
             fi
 
@@ -140,17 +143,17 @@ if [ "$NUM_SHARDS" -gt 0 ]; then
             SHARD_NODE_2_TARGET_ADDR="${GCP_USER}@${SEASON}-shard-${i}-node-2-singapore"
 
             # deploy files to GCP instances
-            printf "\nDeploying files to ${SHARD_TRACKER_TARGET_ADDR}..."
+            printf "\nDeploying files to shard_$i tracker (${SHARD_TRACKER_TARGET_ADDR})...\n\n"
             gcloud compute scp --recurse $FILES_FOR_TRACKER ${SHARD_TRACKER_TARGET_ADDR}:~/ --project $PROJECT_ID --zone $TRACKER_ZONE
-            printf "\nDeploying files to ${SHARD_NODE_0_TARGET_ADDR}..."
+            printf "\nDeploying files to shard_$i node 0 (${SHARD_NODE_0_TARGET_ADDR})...\n\n"
             gcloud compute scp --recurse $FILES_FOR_NODE ${SHARD_NODE_0_TARGET_ADDR}:~/ --project $PROJECT_ID --zone $NODE_0_ZONE
-            printf "\nDeploying files to ${SHARD_NODE_1_TARGET_ADDR}..."
+            printf "\nDeploying files to shard_$i node 1 (${SHARD_NODE_1_TARGET_ADDR})...\n\n"
             gcloud compute scp --recurse $FILES_FOR_NODE ${SHARD_NODE_1_TARGET_ADDR}:~/ --project $PROJECT_ID --zone $NODE_1_ZONE
-            printf "\nDeploying files to ${SHARD_NODE_2_TARGET_ADDR}..."
+            printf "\nDeploying files to shard_$i node 2 (${SHARD_NODE_2_TARGET_ADDR})...\n\n"
             gcloud compute scp --recurse $FILES_FOR_NODE ${SHARD_NODE_2_TARGET_ADDR}:~/  --project $PROJECT_ID --zone $NODE_2_ZONE
 
-             # ssh into each instance, set up the ubuntu VM instance (ONLY NEEDED FOR THE FIRST TIME)
-             if [ "$4" == "--setup" ]; then
+            # ssh into each instance, set up the ubuntu VM instance (ONLY NEEDED FOR THE FIRST TIME)
+            if [[ $OPTIONS = "--setup" ]]; then
                 printf "\n\n###########################\n# Setting up shard_$i tracker #\n###########################\n\n"
                 gcloud compute ssh $SHARD_TRACKER_TARGET_ADDR --command ". setup_blockchain_ubuntu.sh" --project $PROJECT_ID --zone $TRACKER_ZONE
                 printf "\n\n##########################\n# Setting up  shard_$i node 0 #\n##########################\n\n"
@@ -162,13 +165,13 @@ if [ "$NUM_SHARDS" -gt 0 ]; then
             fi
 
             # ssh into each instance, install packages and start up the server
-            printf "\n\n###########################\n# Running shard_$i tracker #\n###########################\n\n"
-            gcloud compute ssh $SHARD_TRACKER_TARGET_ADDR --command ". setup_tracker_gcp.sh && . start_tracker_gcp.sh" --project $PROJECT_ID --zone $TRACKER_ZONE
-            printf "\n\n##########################\n# Running shard_$i node 0 #\n##########################\n\n"
-            gcloud compute ssh $SHARD_NODE_0_TARGET_ADDR --command ". setup_node_gcp.sh && . start_node_gcp.sh $SEASON $i 0" --project $PROJECT_ID --zone $NODE_0_ZONE
-            printf "\n\n##########################\n# Running shard_$i node 1 #\n##########################\n\n"
-            gcloud compute ssh $SHARD_NODE_1_TARGET_ADDR --command ". setup_node_gcp.sh && . start_node_gcp.sh $SEASON $i 1" --project $PROJECT_ID --zone $NODE_1_ZONE
-            printf "\n\n##########################\n# Running shard_$i node 2 #\n##########################\n\n"
-            gcloud compute ssh $SHARD_NODE_2_TARGET_ADDR --command ". setup_node_gcp.sh && . start_node_gcp.sh $SEASON $i 2" --project $PROJECT_ID --zone $NODE_2_ZONE
+            printf "\n\n###########################\n# Starting shard_$i tracker #\n###########################\n\n"
+            gcloud compute ssh $SHARD_TRACKER_TARGET_ADDR --command ". start_tracker_genesis_gcp.sh" --project $PROJECT_ID --zone $TRACKER_ZONE
+            printf "\n\n##########################\n# Starting shard_$i node 0 #\n##########################\n\n"
+            gcloud compute ssh $SHARD_NODE_0_TARGET_ADDR --command ". start_node_genesis_gcp.sh $SEASON $i 0" --project $PROJECT_ID --zone $NODE_0_ZONE
+            printf "\n\n##########################\n# Starting shard_$i node 1 #\n##########################\n\n"
+            gcloud compute ssh $SHARD_NODE_1_TARGET_ADDR --command ". start_node_genesis_gcp.sh $SEASON $i 1" --project $PROJECT_ID --zone $NODE_1_ZONE
+            printf "\n\n##########################\n# Starting shard_$i node 2 #\n##########################\n\n"
+            gcloud compute ssh $SHARD_NODE_2_TARGET_ADDR --command ". start_node_genesis_gcp.sh $SEASON $i 2" --project $PROJECT_ID --zone $NODE_2_ZONE
         done
 fi
diff --git a/deploy_blockchain_incremental_gcp.sh b/deploy_blockchain_incremental_gcp.sh
index 55e4b8e5b..37668edf1 100644
--- a/deploy_blockchain_incremental_gcp.sh
+++ b/deploy_blockchain_incremental_gcp.sh
@@ -1,150 +1,175 @@
 #!/bin/sh
 
-if [ "$#" -lt 3 ]; then
-    echo "Usage: sh deploy_blockchain_incremental_gcp.sh [dev|staging|spring|summer] <GCP Username> <# of Shards> [--setup]"
-    echo "Example: sh deploy_blockchain_incremental_gcp.sh dev lia 0 --setup"
+if [[ "$#" -lt 5 ]] || [[ "$#" -gt 6 ]]; then
+    printf "Usage: sh deploy_blockchain_incremental_gcp.sh [dev|staging|spring|summer] <GCP Username> <# of Shards> [fast|full] [canary|full] [--setup]\n"
+    printf "Example: sh deploy_blockchain_incremental_gcp.sh dev lia 0 fast canary --setup\n"
     exit
 fi
 
-if [ "$1" = 'spring' ] || [ "$1" = 'summer' ] || [ "$1" = 'dev' ] || [ "$1" = 'staging' ]; then
+if [[ "$1" = 'spring' ]] || [[ "$1" = 'summer' ]] || [[ "$1" = 'dev' ]] || [[ "$1" = 'staging' ]]; then
     SEASON="$1"
-    if [ "$1" = 'spring' ] || [ "$1" = 'summer' ]; then
+    if [[ "$1" = 'spring' ]] || [[ "$1" = 'summer' ]]; then
         PROJECT_ID="testnet-prod-ground"
     else
         PROJECT_ID="testnet-$1-ground"
     fi
 else
-    echo "Invalid project/season argument: $1"
+    printf "Invalid <Project/Season> argument: $1\n"
     exit
 fi
-echo "SEASON=$SEASON"
-echo "PROJECT_ID=$PROJECT_ID"
+printf "SEASON=$SEASON\n"
+printf "PROJECT_ID=$PROJECT_ID\n"
 
 GCP_USER="$2"
-echo "GCP_USER=$GCP_USER"
+printf "GCP_USER=$GCP_USER\n"
 
 NUM_SHARDS=$3
-echo "NUM_SHARDS=$NUM_SHARDS"
+printf "NUM_SHARDS=$NUM_SHARDS\n"
+
+if [[ "$4" = 'fast' ]] || [[ "$4" = 'full' ]]; then
+    SYNC_MODE="$4"
+else
+    printf "Invalid <Sync Mode> argument: $4\n"
+    exit
+fi
+printf "SYNC_MODE=$SYNC_MODE\n"
+
+if [[ "$5" = 'canary' ]] || [[ "$5" = 'full' ]]; then
+    RUN_MODE="$5"
+else
+    printf "Invalid <Run Mode> argument: $5\n"
+    exit
+fi
+printf "RUN_MODE=$RUN_MODE\n"
+
+OPTIONS="$6"
+printf "OPTIONS=$OPTIONS\n"
 
 # Get confirmation.
-echo
+printf "\n"
 read -p "Do you want to proceed? >> (y/N) " -n 1 -r
-echo
-echo
-if [[ ! $REPLY =~ ^[Yy]$ ]]
-then
+printf "\n\n"
+if [[ ! $REPLY =~ ^[Yy]$ ]]; then
     [[ "$0" = "$BASH_SOURCE" ]] && exit 1 || return 1 # handle exits from shell or function but don't exit interactive shell
 fi
 
-FILES_FOR_TRACKER="blockchain/ client/ common/ consensus/ db/ genesis-configs/ logger/ tracker-server/ package.json setup_tracker_gcp.sh setup_blockchain_ubuntu.sh start_tracker_gcp.sh"
+FILES_FOR_TRACKER="blockchain/ client/ common/ consensus/ db/ genesis-configs/ logger/ tracker-server/ package.json setup_blockchain_ubuntu.sh start_tracker_incremental_gcp.sh"
 FILES_FOR_NODE="blockchain/ client/ common/ consensus/ db/ json_rpc/ genesis-configs/ logger/ node/ tx-pool/ p2p/ package.json setup_blockchain_ubuntu.sh start_node_incremental_gcp.sh"
 
-TRACKER_TARGET_ADDR="${GCP_USER}@${SEASON}-tracker-taiwan"
-NODE_0_TARGET_ADDR="${GCP_USER}@${SEASON}-node-0-taiwan"
-NODE_1_TARGET_ADDR="${GCP_USER}@${SEASON}-node-1-oregon"
-NODE_2_TARGET_ADDR="${GCP_USER}@${SEASON}-node-2-singapore"
-NODE_3_TARGET_ADDR="${GCP_USER}@${SEASON}-node-3-iowa"
-NODE_4_TARGET_ADDR="${GCP_USER}@${SEASON}-node-4-netherlands"
+NUM_PARENT_NODES=5
+NUM_SHARD_NODES=3
 
 TRACKER_ZONE="asia-east1-b"
-NODE_0_ZONE="asia-east1-b"
-NODE_1_ZONE="us-west1-b"
-NODE_2_ZONE="asia-southeast1-b"
-NODE_3_ZONE="us-central1-a"
-NODE_4_ZONE="europe-west4-a"
-
-# 1. Copy files to gcp
-printf "\nDeploying parent blockchain..."
-printf "\nCopying files to ${TRACKER_TARGET_ADDR}..."
-gcloud compute scp --recurse $FILES_FOR_TRACKER ${TRACKER_TARGET_ADDR}:~/ --project $PROJECT_ID --zone $TRACKER_ZONE
-printf "\nCopying files to ${NODE_0_TARGET_ADDR}..."
-gcloud compute scp --recurse $FILES_FOR_NODE ${NODE_0_TARGET_ADDR}:~/ --project $PROJECT_ID --zone $NODE_0_ZONE
-printf "\nCopying files to ${NODE_1_TARGET_ADDR}..."
-gcloud compute scp --recurse $FILES_FOR_NODE ${NODE_1_TARGET_ADDR}:~/ --project $PROJECT_ID --zone $NODE_1_ZONE
-printf "\nCopying files to ${NODE_2_TARGET_ADDR}..."
-gcloud compute scp --recurse $FILES_FOR_NODE ${NODE_2_TARGET_ADDR}:~/ --project $PROJECT_ID --zone $NODE_2_ZONE
-printf "\nCopying files to ${NODE_3_TARGET_ADDR}..."
-gcloud compute scp --recurse $FILES_FOR_NODE ${NODE_3_TARGET_ADDR}:~/ --project $PROJECT_ID --zone $NODE_3_ZONE
-printf "\nCopying files to ${NODE_4_TARGET_ADDR}..."
-gcloud compute scp --recurse $FILES_FOR_NODE ${NODE_4_TARGET_ADDR}:~/ --project $PROJECT_ID --zone $NODE_4_ZONE
-
-# ssh into each instance, set up the ubuntu VM instance (ONLY NEEDED FOR THE FIRST TIME)
-if [ "$4" == "--setup" ]; then
-    printf "\n\n##########################\n# Setting up parent tracker #\n###########################\n\n"
-    gcloud compute ssh $TRACKER_TARGET_ADDR --command ". setup_blockchain_ubuntu.sh" --project $PROJECT_ID --zone $TRACKER_ZONE
-    printf "\n\n##########################\n# Setting up parent node 0 #\n##########################\n\n"
-    gcloud compute ssh $NODE_0_TARGET_ADDR --command ". setup_blockchain_ubuntu.sh" --project $PROJECT_ID --zone $NODE_0_ZONE
-    printf "\n\n##########################\n# Setting up parent node 1 #\n##########################\n\n"
-    gcloud compute ssh $NODE_1_TARGET_ADDR --command ". setup_blockchain_ubuntu.sh" --project $PROJECT_ID --zone $NODE_1_ZONE
-    printf "\n\n##########################\n# Setting up parent node 2 #\n##########################\n\n"
-    gcloud compute ssh $NODE_2_TARGET_ADDR --command ". setup_blockchain_ubuntu.sh" --project $PROJECT_ID --zone $NODE_2_ZONE
-    printf "\n\n##########################\n# Setting up parent node 3 #\n##########################\n\n"
-    gcloud compute ssh $NODE_3_TARGET_ADDR --command ". setup_blockchain_ubuntu.sh" --project $PROJECT_ID --zone $NODE_3_ZONE
-    printf "\n\n##########################\n# Setting up parent node 4 #\n##########################\n\n"
-    gcloud compute ssh $NODE_4_TARGET_ADDR --command ". setup_blockchain_ubuntu.sh" --project $PROJECT_ID --zone $NODE_4_ZONE
-fi
+NODE_ZONE_LIST=(
+    "asia-east1-b" \
+    "us-west1-b" \
+    "asia-southeast1-b" \
+    "us-central1-a" \
+    "europe-west4-a")
+
+function deploy_tracker() {
+    local num_nodes="$1"
+
+    printf "\n* >> Deploying tracker ********************************************************\n\n"
+
+    printf "TRACKER_TARGET_ADDR='$TRACKER_TARGET_ADDR'\n"
+    printf "TRACKER_ZONE='$TRACKER_ZONE'\n"
+
+    # 1. Copy files to gcp
+    printf "\n\n[[[[ Copying files for tracker ]]]]\n\n"
+    SCP_CMD="gcloud compute scp --recurse $FILES_FOR_TRACKER ${TRACKER_TARGET_ADDR}:~/ --project $PROJECT_ID --zone $TRACKER_ZONE"
+    printf "SCP_CMD='$SCP_CMD'\n\n"
+    eval $SCP_CMD
+
+    # ssh into each instance, set up the ubuntu VM instance (ONLY NEEDED FOR THE FIRST TIME)
+    if [[ $OPTIONS = "--setup" ]]; then
+        printf "\n\n[[[[ Setting up tracker ]]]]\n\n"
+        SETUP_CMD="gcloud compute ssh $TRACKER_TARGET_ADDR --command '. setup_blockchain_ubuntu.sh' --project $PROJECT_ID --zone $TRACKER_ZONE"
+        printf "SETUP_CMD='$SETUP_CMD'\n\n"
+        eval $SETUP_CMD
+    fi
 
-# 2. Set up parent chain
-printf "\n\n############################\n# Running parent tracker #\n############################\n\n"
-gcloud compute ssh $TRACKER_TARGET_ADDR --command ". setup_tracker_gcp.sh && . start_tracker_gcp.sh" --project $PROJECT_ID --zone $TRACKER_ZONE
-printf "\n\n###########################\n# Running parent node 0 #\n###########################\n\n"
-gcloud compute ssh $NODE_0_TARGET_ADDR --command ". start_node_incremental_gcp.sh $SEASON 0 0" --project $PROJECT_ID --zone $NODE_0_ZONE
-printf "\n\n#########################\n# Running parent node 1 #\n#########################\n\n"
-gcloud compute ssh $NODE_1_TARGET_ADDR --command ". start_node_incremental_gcp.sh $SEASON 0 1" --project $PROJECT_ID --zone $NODE_1_ZONE
-printf "\n\n#########################\n# Running parent node 2 #\n#########################\n\n"
-gcloud compute ssh $NODE_2_TARGET_ADDR --command ". start_node_incremental_gcp.sh $SEASON 0 2" --project $PROJECT_ID --zone $NODE_2_ZONE
-printf "\n\n#########################\n# Running parent node 3 #\n#########################\n\n"
-gcloud compute ssh $NODE_3_TARGET_ADDR --command ". start_node_incremental_gcp.sh $SEASON 0 3" --project $PROJECT_ID --zone $NODE_3_ZONE
-printf "\n\n#########################\n# Running parent node 4 #\n#########################\n\n"
-gcloud compute ssh $NODE_4_TARGET_ADDR --command ". start_node_incremental_gcp.sh $SEASON 0 4" --project $PROJECT_ID --zone $NODE_4_ZONE
-
-# 3. Shards
-if [ "$NUM_SHARDS" -gt 0 ]; then
-    printf "\nDeploying shard blockchains..."
-    for i in $(seq $NUM_SHARDS)
-        do
-            echo "shard #$i"
+    # 2. Start tracker
+    printf "\n\n[[[[ Starting tracker ]]]]\n\n"
+    START_CMD="gcloud compute ssh $TRACKER_TARGET_ADDR --command '. start_tracker_incremental_gcp.sh $num_nodes' --project $PROJECT_ID --zone $TRACKER_ZONE"
+    printf "START_CMD='$START_CMD'\n\n"
+    eval $START_CMD
+}
+
+function deploy_node() {
+    local node_index="$1"
+    local node_target_addr=${NODE_TARGET_ADDR_LIST[${node_index}]}
+    local node_zone=${NODE_ZONE_LIST[${node_index}]}
+
+    printf "\n* >> Deploying node $node_index *********************************************************\n\n"
+
+    printf "node_target_addr='$node_target_addr'\n"
+    printf "node_zone='$node_zone'\n"
+
+    # 1. Copy files to gcp
+    printf "\n\n[[[[ Copying files for node $node_index ]]]]\n\n"
+    SCP_CMD="gcloud compute scp --recurse $FILES_FOR_NODE ${node_target_addr}:~/ --project $PROJECT_ID --zone $node_zone"
+    printf "SCP_CMD='$SCP_CMD'\n\n"
+    eval $SCP_CMD
+
+    # ssh into each instance, set up the ubuntu VM instance (ONLY NEEDED FOR THE FIRST TIME)
+    if [[ $OPTIONS = "--setup" ]]; then
+        printf "\n\n[[[[ Setting up node $node_index ]]]]\n\n"
+        SETUP_CMD="gcloud compute ssh $node_target_addr --command '. setup_blockchain_ubuntu.sh' --project $PROJECT_ID --zone $node_zone"
+        printf "SETUP_CMD='$SETUP_CMD'\n\n"
+        eval $SETUP_CMD
+    fi
 
-            # generate genesis config files in ./blockchain/shard_$i
-            if [ "$4" == "--setup" ]; then
-                node ./tools/generateShardGenesisFiles.js $SEASON 10 $i
-            fi
+    # 2. Start node
+    printf "\n\n[[[[ Starting node $node_index ]]]]\n\n"
+    START_CMD="gcloud compute ssh $node_target_addr --command '. start_node_incremental_gcp.sh $SEASON 0 $node_index $SYNC_MODE' --project $PROJECT_ID --zone $node_zone"
+    printf "START_CMD='$START_CMD'\n\n"
+    eval $START_CMD
+}
 
-            SHARD_TRACKER_TARGET_ADDR="${GCP_USER}@${SEASON}-shard-${i}-tracker-taiwan"
-            SHARD_NODE_0_TARGET_ADDR="${GCP_USER}@${SEASON}-shard-${i}-node-0-taiwan"
-            SHARD_NODE_1_TARGET_ADDR="${GCP_USER}@${SEASON}-shard-${i}-node-1-oregon"
-            SHARD_NODE_2_TARGET_ADDR="${GCP_USER}@${SEASON}-shard-${i}-node-2-singapore"
-
-            # deploy files to GCP instances
-            printf "\nDeploying files to ${SHARD_TRACKER_TARGET_ADDR}..."
-            gcloud compute scp --recurse $FILES_FOR_TRACKER ${SHARD_TRACKER_TARGET_ADDR}:~/ --project $PROJECT_ID --zone $TRACKER_ZONE
-            printf "\nDeploying files to ${SHARD_NODE_0_TARGET_ADDR}..."
-            gcloud compute scp --recurse $FILES_FOR_NODE ${SHARD_NODE_0_TARGET_ADDR}:~/ --project $PROJECT_ID --zone $NODE_0_ZONE
-            printf "\nDeploying files to ${SHARD_NODE_1_TARGET_ADDR}..."
-            gcloud compute scp --recurse $FILES_FOR_NODE ${SHARD_NODE_1_TARGET_ADDR}:~/ --project $PROJECT_ID --zone $NODE_1_ZONE
-            printf "\nDeploying files to ${SHARD_NODE_2_TARGET_ADDR}..."
-            gcloud compute scp --recurse $FILES_FOR_NODE ${SHARD_NODE_2_TARGET_ADDR}:~/  --project $PROJECT_ID --zone $NODE_2_ZONE
-
-            # ssh into each instance, set up the ubuntu VM instance (ONLY NEEDED FOR THE FIRST TIME)
-            if [ "$4" == "--setup" ]; then
-                printf "\n\n###########################\n# Setting up shard_$i tracker #\n###########################\n\n"
-                gcloud compute ssh $SHARD_TRACKER_TARGET_ADDR --command ". setup_blockchain_ubuntu.sh" --project $PROJECT_ID --zone $TRACKER_ZONE
-                printf "\n\n##########################\n# Setting up  shard_$i node 0 #\n##########################\n\n"
-                gcloud compute ssh $SHARD_NODE_0_TARGET_ADDR --command ". setup_blockchain_ubuntu.sh" --project $PROJECT_ID --zone $NODE_0_ZONE
-                printf "\n\n##########################\n# Setting up  shard_$i node 1 #\n##########################\n\n"
-                gcloud compute ssh $SHARD_NODE_1_TARGET_ADDR --command ". setup_blockchain_ubuntu.sh" --project $PROJECT_ID --zone $NODE_1_ZONE
-                printf "\n\n##########################\n# Setting up  shard_$i node 2 #\n##########################\n\n"
-                gcloud compute ssh $SHARD_NODE_2_TARGET_ADDR --command ". setup_blockchain_ubuntu.sh" --project $PROJECT_ID --zone $NODE_2_ZONE
-            fi
+printf "###############################################################################\n"
+printf "# Deploying parent blockchain #\n"
+printf "###############################################################################\n\n"
 
-            # ssh into each instance, install packages and start up the server
-            printf "\n\n###########################\n# Running shard_$i tracker #\n###########################\n\n"
-            gcloud compute ssh $SHARD_TRACKER_TARGET_ADDR --command ". setup_tracker_gcp.sh && . start_tracker_gcp.sh" --project $PROJECT_ID --zone $TRACKER_ZONE
-            printf "\n\n##########################\n# Running shard_$i node 0 #\n##########################\n\n"
-            gcloud compute ssh $SHARD_NODE_0_TARGET_ADDR --command ". start_node_incremental_gcp.sh $SEASON $i 0" --project $PROJECT_ID --zone $NODE_0_ZONE
-            printf "\n\n##########################\n# Running shard_$i node 1 #\n##########################\n\n"
-            gcloud compute ssh $SHARD_NODE_1_TARGET_ADDR --command ". start_node_incremental_gcp.sh $SEASON $i 1" --project $PROJECT_ID --zone $NODE_1_ZONE
-            printf "\n\n##########################\n# Running shard_$i node 2 #\n##########################\n\n"
-            gcloud compute ssh $SHARD_NODE_2_TARGET_ADDR --command ". start_node_incremental_gcp.sh $SEASON $i 2" --project $PROJECT_ID --zone $NODE_2_ZONE
+TRACKER_TARGET_ADDR="${GCP_USER}@${SEASON}-tracker-taiwan"
+NODE_TARGET_ADDR_LIST=(
+    "${GCP_USER}@${SEASON}-node-0-taiwan" \
+    "${GCP_USER}@${SEASON}-node-1-oregon" \
+    "${GCP_USER}@${SEASON}-node-2-singapore" \
+    "${GCP_USER}@${SEASON}-node-3-iowa" \
+    "${GCP_USER}@${SEASON}-node-4-netherlands")
+
+if [[ $RUN_MODE = "canary" ]]; then
+    deploy_node "0"
+else
+    deploy_tracker "$NUM_PARENT_NODES"
+    for j in `seq 0 $(( ${NUM_PARENT_NODES} - 1 ))`
+        do
+            deploy_node "$j"
         done
 fi
+
+if [[ "$NUM_SHARDS" -gt 0 ]]; then
+    for i in $(seq $NUM_SHARDS)
+        do
+            printf "###############################################################################\n"
+            printf "# Deploying shard $i blockchain #\n"
+            printf "###############################################################################\n\n"
+
+            TRACKER_TARGET_ADDR="${GCP_USER}@${SEASON}-shard-${i}-tracker-taiwan"
+            NODE_TARGET_ADDR_LIST=( \
+                "${GCP_USER}@${SEASON}-shard-${i}-node-0-taiwan" \
+                "${GCP_USER}@${SEASON}-shard-${i}-node-1-oregon" \
+                "${GCP_USER}@${SEASON}-shard-${i}-node-2-singapore")
+
+            if [[ $RUN_MODE = "canary" ]]; then
+                deploy_node "0"
+            else
+                deploy_tracker "$NUM_SHARD_NODES"
+                for j in `seq 0 $(( ${NUM_SHARD_NODES} - 1 ))`
+                    do
+                        deploy_node "$j"
+                    done
+            fi
+    done
+fi
diff --git a/deploy_monitoring_gcp.sh b/deploy_monitoring_gcp.sh
index 8f68f001f..8365f27c8 100644
--- a/deploy_monitoring_gcp.sh
+++ b/deploy_monitoring_gcp.sh
@@ -1,14 +1,14 @@
 #!/bin/sh
 
-if [ "$#" -lt 2 ]; then
+if [[ "$#" -lt 2 ]]; then
     echo "Usage: sh deploy_monitoring_gcp.sh [dev|staging|spring|summer] <GCP Username>"
     echo "Example: sh deploy_monitoring_gcp.sh dev seo"
     exit
 fi
 
-if [ "$1" = 'spring' ] || [ "$1" = 'summer' ] || [ "$1" = 'dev' ] || [ "$1" = 'staging' ]; then
+if [[ "$1" = 'spring' ]] || [[ "$1" = 'summer' ]] || [[ "$1" = 'dev' ]] || [[ "$1" = 'staging' ]]; then
     SEASON="$1"
-    if [ "$1" = 'spring' ] || [ "$1" = 'summer' ]; then
+    if [[ "$1" = 'spring' ]] || [[ "$1" = 'summer' ]]; then
         PROJECT_ID="testnet-prod-ground"
     else
         PROJECT_ID="testnet-$1-ground"
diff --git a/genesis-configs/afan-shard/genesis_params.json b/genesis-configs/afan-shard/genesis_params.json
index c7e4124ba..9b1a2302b 100644
--- a/genesis-configs/afan-shard/genesis_params.json
+++ b/genesis-configs/afan-shard/genesis_params.json
@@ -14,7 +14,9 @@
   },
   "consensus": {
     "MIN_STAKE_PER_VALIDATOR": 100000,
+    "MAX_STAKE_PER_VALIDATOR": 100000,
     "MIN_NUM_VALIDATORS": 3,
+    "MAX_NUM_VALIDATORS": 9,
     "EPOCH_MS": 3000,
     "GENESIS_WHITELIST": {},
     "GENESIS_VALIDATORS": {}
@@ -28,13 +30,14 @@
   },
   "resource": {
     "TREE_HEIGHT_LIMIT": 20,
-    "TREE_SIZE_LIMIT": 1000000,
+    "STATE_TREE_BYTES_LIMIT": 5000000000,
     "STATE_LABEL_LENGTH_LIMIT": 150,
     "TX_BYTES_LIMIT": 10000,
     "BATCH_TX_LIST_SIZE_LIMIT": 50,
     "TX_POOL_SIZE_LIMIT": 1000,
     "TX_POOL_SIZE_LIMIT_PER_ACCOUNT": 100,
     "BANDWIDTH_BUDGET_PER_BLOCK": 10000,
-    "SERVICE_BANDWIDTH_BUDGET_PER_BLOCK": 5000
+    "MIN_STAKING_FOR_APP_TX": 0,
+    "MIN_BALANCE_FOR_SERVICE_TX": 0
   }
 }
diff --git a/genesis-configs/base/genesis_params.json b/genesis-configs/base/genesis_params.json
index 5e586f926..b2beb5682 100644
--- a/genesis-configs/base/genesis_params.json
+++ b/genesis-configs/base/genesis_params.json
@@ -14,7 +14,9 @@
   },
   "consensus": {
     "MIN_STAKE_PER_VALIDATOR": 100000,
+    "MAX_STAKE_PER_VALIDATOR": 100000,
     "MIN_NUM_VALIDATORS": 3,
+    "MAX_NUM_VALIDATORS": 9,
     "EPOCH_MS": 3000,
     "GENESIS_WHITELIST": {},
     "GENESIS_VALIDATORS": {}
@@ -28,13 +30,14 @@
   },
   "resource": {
     "TREE_HEIGHT_LIMIT": 20,
-    "TREE_SIZE_LIMIT": 1000000,
+    "STATE_TREE_BYTES_LIMIT": 5000000000,
     "STATE_LABEL_LENGTH_LIMIT": 150,
     "TX_BYTES_LIMIT": 10000,
     "BATCH_TX_LIST_SIZE_LIMIT": 50,
     "TX_POOL_SIZE_LIMIT": 1000,
     "TX_POOL_SIZE_LIMIT_PER_ACCOUNT": 100,
     "BANDWIDTH_BUDGET_PER_BLOCK": 10000,
-    "SERVICE_BANDWIDTH_BUDGET_PER_BLOCK": 5000
+    "MIN_STAKING_FOR_APP_TX": 0,
+    "MIN_BALANCE_FOR_SERVICE_TX": 0
   }
 }
diff --git a/genesis-configs/base/genesis_rules.json b/genesis-configs/base/genesis_rules.json
index c6d9a0387..b620677a4 100644
--- a/genesis-configs/base/genesis_rules.json
+++ b/genesis-configs/base/genesis_rules.json
@@ -1,9 +1,13 @@
 {
-  ".write": false,
+  ".rule": {
+    "write": false
+  },
   "accounts": {
     "$user_addr": {
       "balance": {
-        ".write": "auth.fid === '_transfer'"
+        ".rule": {
+          "write": "auth.fid === '_transfer'"
+        }
       }
     }
   },
@@ -11,12 +15,16 @@
     "$user_addr": {
       "$checkin_id": {
         "request": {
-          ".write": "data === null && auth.addr === $user_addr && util.isDict(newData)"
+          ".rule": {
+            "write": "data === null && auth.addr === $user_addr && util.isDict(newData)"
+          }
         },
         "parent_finalize": {
           "$tx_hash": {
             "result": {
-              ".write": "auth.addr === getValue('/sharding/config/shard_owner') && util.isBool(newData)"
+              ".rule": {
+                "write": "auth.addr === getValue('/sharding/config/shard_owner') && util.isBool(newData)"
+              }
             }
           }
         }
@@ -26,20 +34,28 @@
   "consensus": {
     "number": {
       "$number": {
-        ".write": "newData === null && !!getValue('/consensus/number/' + (Number($number) + 1000))",
+        ".rule": {
+          "write": "newData === null && !!getValue('/consensus/number/' + (Number($number) + 1000))"
+        },
         "propose": {
-          ".write": "newData !== null && util.isDict(newData) && newData.proposer === auth.addr && Number($number) === newData.number && getValue('/consensus/whitelist/' + auth.addr) === true && (lastBlockNumber < 1 || getValue('/service_accounts/staking/consensus/' + auth.addr + '|0/balance') >= util.getMinStakeAmount()) && util.isNumber(newData.gas_cost_total) && (newData.gas_cost_total === 0 || newData.gas_cost_total === getValue('/service_accounts/gas_fee/gas_fee/' + $number + '/balance'))"
+          ".rule": {
+            "write": "util.isDict(newData) && newData.proposer === auth.addr && Number($number) === newData.number && getValue('/consensus/whitelist/' + auth.addr) === true && (lastBlockNumber < 1 || (getValue('/service_accounts/staking/consensus/' + auth.addr + '|0/balance') >= util.getMinStakeAmount() && getValue('/service_accounts/staking/consensus/' + auth.addr + '|0/balance') <= util.getMaxStakeAmount())) && util.isNumber(newData.gas_cost_total) && (newData.gas_cost_total === 0 || newData.gas_cost_total === getValue('/service_accounts/gas_fee/gas_fee/' + $number + '/balance'))"
+          }
         },
         "vote": {
           "$user_addr": {
-            ".write": "auth.addr === $user_addr && util.isDict(newData) && util.isString(newData.block_hash) && util.isNumber(newData.stake) && newData.stake > 0 && getValue('/consensus/whitelist/' + auth.addr) === true && (lastBlockNumber < 1 || getValue('/service_accounts/staking/consensus/' + auth.addr + '|0/balance') >= util.getMinStakeAmount())"
+            ".rule": {
+              "write": "auth.addr === $user_addr && util.isDict(newData) && util.isString(newData.block_hash) && util.isNumber(newData.stake) && (lastBlockNumber < 1 || util.getConsensusStakeBalance(auth.addr, getValue) === newData.stake)"
+            }
           }
         }
       }
     },
     "whitelist": {
       "$user_addr": {
-        ".write": "getValue('/manage_app/consensus/config/admin/' + auth.addr) === true && (newData === true || (newData === null && util.length(util.values(getValue('/consensus/whitelist')).filter(x => x === true)) > util.getMinNumValidators()))"
+        ".rule": {
+          "write": "util.isAppAdmin('consensus', auth.addr, getValue) === true && (newData === true || (newData === null && util.length(util.values(getValue('/consensus/whitelist')).filter(x => x === true)) > util.getMinNumValidators()))"
+        }
       }
     }
   },
@@ -48,21 +64,31 @@
       "$target_account": {
         "$escrow_key": {
           "config": {
-            ".write": "data === null || getValue('/escrow/' + $source_account + '/' + $target_account + '/' + $escrow_key + '/config/admin/' + auth.addr) === true"
+            ".rule": {
+              "write": "data === null || getValue('/escrow/' + $source_account + '/' + $target_account + '/' + $escrow_key + '/config/admin/' + auth.addr) === true"
+            }
           },
           "hold": {
             "$record_id": {
-              ".write": "((util.isServAcntName($source_account) && getValue(util.getAppAdminPath($source_account) + '/' + auth.addr) === true) || (util.isCksumAddr($source_account) && $source_account === auth.addr)) && getValue('/escrow/' + $source_account + '/' + $target_account + '/' + $escrow_key + '/config') !== null && data === null && util.isDict(newData)",
+              ".rule": {
+                "write": "((util.isServAcntName($source_account) && util.isAppAdminFromServAcntName($source_account, auth.addr, getValue) === true) || (util.isCksumAddr($source_account) && $source_account === auth.addr)) && getValue('/escrow/' + $source_account + '/' + $target_account + '/' + $escrow_key + '/config') !== null && data === null && util.isDict(newData)"
+              },
               "result": {
-                ".write": "auth.fid === '_hold'"
+                ".rule": {
+                  "write": "auth.fid === '_hold'"
+                }
               }
             }
           },
           "release": {
             "$record_id": {
-              ".write": "getValue('/escrow/' + $source_account + '/' + $target_account + '/' + $escrow_key + '/config/admin/' + auth.addr) === true && data === null && util.isDict(newData) && util.isNumber(newData.ratio) && 0 <= newData.ratio && newData.ratio <= 1",
+              ".rule": {
+                "write": "getValue('/escrow/' + $source_account + '/' + $target_account + '/' + $escrow_key + '/config/admin/' + auth.addr) === true && data === null && util.isDict(newData) && util.isNumber(newData.ratio) && 0 <= newData.ratio && newData.ratio <= 1"
+              },
               "result": {
-                ".write": "auth.fid === '_release'"
+                ".rule": {
+                  "write": "auth.fid === '_release'"
+                }
               }
             }
           }
@@ -75,7 +101,9 @@
       "$from": {
         "$block_number": {
           "$tx_hash": {
-            ".write": "(auth.addr === $from || (util.isServAcntName($from) && getValue(util.getBillingUserPath($from, auth.addr)) === true)) && data === null && util.isDict(newData) && util.isNumber(newData.amount) && newData.amount <= getValue(util.getBalancePath($from))"
+            ".rule": {
+              "write": "(auth.addr === $from || (util.isServAcntName($from) && util.isBillingUser($from, auth.addr, getValue) === true)) && data === null && util.isDict(newData) && util.isNumber(newData.amount) && newData.amount <= util.getBalance($from, getValue)"
+            }
           }
         }
       }
@@ -84,13 +112,19 @@
   "manage_app": {
     "$app_name": {
       "config": {
-        ".write": "auth.fid === '_createApp' || getValue('/manage_app/' + $app_name + '/config/admin/' + auth.addr) === true"
+        ".rule": {
+          "write": "auth.fid === '_createApp' || util.isAppAdmin($app_name, auth.addr, getValue) === true"
+        }
       },
       "create": {
         "$record_id": {
-          ".write": "data === null && getValue('/manage_app/' + $app_name + '/config') === null && util.isDict(newData)",
+          ".rule": {
+            "write": "data === null && getValue('/manage_app/' + $app_name + '/config') === null && util.isDict(newData)"
+          },
           "result": {
-            ".write": "auth.fid === '_createApp'"
+            ".rule": {
+              "write": "auth.fid === '_createApp'"
+            }
           }
         }
       }
@@ -102,17 +136,25 @@
         "$payment_key": {
           "claim": {
             "$record_id": {
-              ".write": "getValue('/manage_app/' + $service_name + '/config/admin/' + auth.addr) === true && data === null && util.isDict(newData) && util.isNumber(newData.amount) && newData.amount > 0 && (util.isCksumAddr(newData.target) || util.isServAcntName(newData.target))",
+              ".rule": {
+                "write": "util.isAppAdmin($service_name, auth.addr, getValue) === true && data === null && util.isDict(newData) && util.isNumber(newData.amount) && newData.amount > 0 && (util.isCksumAddr(newData.target) || util.isServAcntName(newData.target))"
+              },
               "result": {
-                ".write": "auth.fid === '_claim'"
+                ".rule": {
+                  "write": "auth.fid === '_claim'"
+                }
               }
             }
           },
           "pay": {
             "$record_id": {
-              ".write": "getValue('/manage_app/' + $service_name + '/config/admin/' + auth.addr) === true && data === null && util.isDict(newData) && util.isNumber(newData.amount) && newData.amount > 0",
+              ".rule": {
+                "write": "util.isAppAdmin($service_name, auth.addr, getValue) === true && data === null && util.isDict(newData) && util.isNumber(newData.amount) && newData.amount > 0"
+              },
               "result": {
-                ".write": "auth.fid === '_pay'"
+                ".rule": {
+                  "write": "auth.fid === '_pay'"
+                }
               }
             }
           }
@@ -125,7 +167,9 @@
       "$service_name": {
         "$key": {
           "balance": {
-            ".write": "auth.fid === '_transfer'"
+            ".rule": {
+              "write": "auth.fid === '_transfer'"
+            }
           }
         }
       }
@@ -133,39 +177,55 @@
   },
   "sharding": {
     "shard": {
-      ".write": false,
+      ".rule": {
+        "write": false
+      },
       "$sharding_path": {
-        ".write": "(data === null && util.isDict(newData) && util.isString(newData.sharding_path) && util.isString(newData.parent_chain_poc) && util.isNumber(newData.reporting_period) && util.isValAddr(newData.shard_owner) && util.isValAddr(newData.shard_reporter) && util.isValShardProto(newData.sharding_protocol) && evalOwner(newData.sharding_path, 'write_owner', auth) && evalOwner(newData.sharding_path, 'write_rule', auth) && evalOwner(newData.sharding_path, 'write_function', auth)) || (auth.addr === data.shard_owner && newData === null)"
+        ".rule": {
+          "write": "(data === null && util.isDict(newData) && util.isString(newData.sharding_path) && util.isString(newData.parent_chain_poc) && util.isNumber(newData.reporting_period) && util.isValAddr(newData.shard_owner) && util.isValAddr(newData.shard_reporter) && util.isValShardProto(newData.sharding_protocol) && evalOwner(newData.sharding_path, 'write_owner', auth) && evalOwner(newData.sharding_path, 'write_rule', auth) && evalOwner(newData.sharding_path, 'write_function', auth)) || (auth.addr === data.shard_owner && newData === null)"
+        }
       }
     }
   },
   "staking": {
     "$service_name": {
       "balance_total": {
-        ".write": "auth.fid === '_stake' || auth.fid === '_unstake'"
+        ".rule": {
+          "write": "auth.fid === '_stake' || auth.fid === '_unstake'"
+        }
       },
       "$user_addr": {
         "$staking_key": {
           "expire_at": {
-            ".write": "auth.fid === '_stake'"
+            ".rule": {
+              "write": "auth.fid === '_stake'"
+            }
           },
           "stake": {
             "$record_id": {
               "value": {
-                ".write": "$user_addr === auth.addr && data === null && util.isNumber(newData) && newData >= 0 && getValue('/accounts/' + $user_addr + '/balance') >= newData"
+                ".rule": {
+                  "write": "$user_addr === auth.addr && data === null && util.isNumber(newData) && newData >= 0 && getValue('/accounts/' + $user_addr + '/balance') >= newData"
+                }
               },
               "result": {
-                ".write": "auth.fid === '_stake'"
+                ".rule": {
+                  "write": "auth.fid === '_stake'"
+                }
               }
             }
           },
           "unstake": {
             "$record_id": {
               "value": {
-                ".write": "$user_addr === auth.addr && data === null && util.isNumber(newData) && newData > 0 && newData <= getValue(util.getBalancePath(util.toServiceAccountName('staking', $service_name, $user_addr + '|' + $staking_key)))"
+                ".rule": {
+                  "write": "$user_addr === auth.addr && data === null && util.isNumber(newData) && newData > 0 && newData <= util.getBalance(util.toServiceAccountName('staking', $service_name, $user_addr + '|' + $staking_key), getValue)"
+                }
               },
               "result": {
-                ".write": "auth.fid === '_unstake'"
+                ".rule": {
+                  "write": "auth.fid === '_unstake'"
+                }
               }
             }
           }
@@ -178,10 +238,14 @@
       "$to": {
         "$key": {
           "value": {
-            ".write": "(auth.addr === $from || auth.fid === '_stake' || auth.fid === '_unstake' || auth.fid === '_pay' || auth.fid === '_claim' || auth.fid === '_hold' || auth.fid === '_release' || auth.fid === '_collectFee' || auth.fid === '_distributeFee') && !getValue('transfer/' + $from + '/' + $to + '/' + $key) && (util.isServAcntName($from) || util.isCksumAddr($from)) && (util.isServAcntName($to) || util.isCksumAddr($to)) && $from !== $to && util.isNumber(newData) && getValue(util.getBalancePath($from)) >= newData"
+            ".rule": {
+              "write": "(auth.addr === $from || auth.fid === '_stake' || auth.fid === '_unstake' || auth.fid === '_pay' || auth.fid === '_claim' || auth.fid === '_hold' || auth.fid === '_release' || auth.fid === '_collectFee' || auth.fid === '_distributeFee') && !getValue('transfer/' + $from + '/' + $to + '/' + $key) && (util.isServAcntName($from) || util.isCksumAddr($from)) && (util.isServAcntName($to) || util.isCksumAddr($to)) && $from !== $to && util.isNumber(newData) && util.getBalance($from, getValue) >= newData"
+            }
           },
           "result": {
-            ".write": "auth.fid === '_transfer'"
+            ".rule": {
+              "write": "auth.fid === '_transfer'"
+            }
           }
         }
       }
diff --git a/genesis-configs/sim-shard/genesis_params.json b/genesis-configs/sim-shard/genesis_params.json
index d01e0c7ab..8cb3cf5c2 100644
--- a/genesis-configs/sim-shard/genesis_params.json
+++ b/genesis-configs/sim-shard/genesis_params.json
@@ -14,7 +14,9 @@
   },
   "consensus": {
     "MIN_STAKE_PER_VALIDATOR": 100000,
+    "MAX_STAKE_PER_VALIDATOR": 100000,
     "MIN_NUM_VALIDATORS": 3,
+    "MAX_NUM_VALIDATORS": 9,
     "EPOCH_MS": 3000,
     "GENESIS_WHITELIST": {},
     "GENESIS_VALIDATORS": {}
@@ -28,13 +30,14 @@
   },
   "resource": {
     "TREE_HEIGHT_LIMIT": 20,
-    "TREE_SIZE_LIMIT": 1000000,
+    "STATE_TREE_BYTES_LIMIT": 5000000000,
     "STATE_LABEL_LENGTH_LIMIT": 150,
     "TX_BYTES_LIMIT": 10000,
     "BATCH_TX_LIST_SIZE_LIMIT": 50,
     "TX_POOL_SIZE_LIMIT": 1000,
     "TX_POOL_SIZE_LIMIT_PER_ACCOUNT": 100,
     "BANDWIDTH_BUDGET_PER_BLOCK": 10000,
-    "SERVICE_BANDWIDTH_BUDGET_PER_BLOCK": 5000
+    "MIN_STAKING_FOR_APP_TX": 0,
+    "MIN_BALANCE_FOR_SERVICE_TX": 0
   }
 }
diff --git a/genesis-configs/testnet/genesis_params.json b/genesis-configs/testnet/genesis_params.json
index 3ebd89a5e..45b3f046f 100644
--- a/genesis-configs/testnet/genesis_params.json
+++ b/genesis-configs/testnet/genesis_params.json
@@ -14,7 +14,9 @@
   },
   "consensus": {
     "MIN_STAKE_PER_VALIDATOR": 100000,
+    "MAX_STAKE_PER_VALIDATOR": 100000,
     "MIN_NUM_VALIDATORS": 5,
+    "MAX_NUM_VALIDATORS": 15,
     "EPOCH_MS": 3000,
     "GENESIS_WHITELIST": {},
     "GENESIS_VALIDATORS": {}
@@ -28,13 +30,14 @@
   },
   "resource": {
     "TREE_HEIGHT_LIMIT": 20,
-    "TREE_SIZE_LIMIT": 1000000,
+    "STATE_TREE_BYTES_LIMIT": 5000000000,
     "STATE_LABEL_LENGTH_LIMIT": 150,
     "TX_BYTES_LIMIT": 10000,
     "BATCH_TX_LIST_SIZE_LIMIT": 50,
     "TX_POOL_SIZE_LIMIT": 1000,
     "TX_POOL_SIZE_LIMIT_PER_ACCOUNT": 100,
     "BANDWIDTH_BUDGET_PER_BLOCK": 10000,
-    "SERVICE_BANDWIDTH_BUDGET_PER_BLOCK": 5000
+    "MIN_STAKING_FOR_APP_TX": 0,
+    "MIN_BALANCE_FOR_SERVICE_TX": 0
   }
 }
diff --git a/integration/afan_dapp.test.js b/integration/afan_dapp.test.js
index ae028cbc8..b04b735a1 100644
--- a/integration/afan_dapp.test.js
+++ b/integration/afan_dapp.test.js
@@ -7,7 +7,7 @@ const syncRequest = require('sync-request');
 const AfanClient = require('../afan_client');
 const { CHAINS_DIR } = require('../common/constants');
 const CommonUtil = require('../common/common-util');
-const { waitUntilTxFinalized, parseOrLog } = require('../unittest/test-util');
+const { waitUntilTxFinalized, parseOrLog, setUpApp } = require('../unittest/test-util');
 const PROJECT_ROOT = require('path').dirname(__filename) + '/../';
 const TRACKER_SERVER = PROJECT_ROOT + 'tracker-server/index.js';
 const APP_SERVER = PROJECT_ROOT + 'client/index.js';
@@ -62,34 +62,15 @@ async function setUp() {
       'GET', server3 + '/get_address').body.toString('utf-8')).result;
   const server4Addr = parseOrLog(syncRequest(
       'GET', server4 + '/get_address').body.toString('utf-8')).result;
-  const appStakingRes = parseOrLog(syncRequest('POST', server1 + '/set_value', {
-    json: {
-      ref: `/staking/afan/${server1Addr}/0/stake/${Date.now()}/value`,
-      value: 1
-    }
-  }).body.toString('utf-8')).result;
-  assert.deepEqual(CommonUtil.isFailedTx(_.get(appStakingRes, 'result')), false);
-  if (!(await waitUntilTxFinalized(serverList, appStakingRes.tx_hash))) {
-    console.log(`setUp(): Failed to check finalization of app staking tx.`);
-  }
 
-  const createAppRes = parseOrLog(syncRequest('POST', server1 + '/set_value', {
-    json: {
-      ref: `/manage_app/afan/create/${Date.now()}`,
-      value: {
-        admin: {
-          [server1Addr]: true,
-          [server2Addr]: true,
-          [server3Addr]: true,
-          [server4Addr]: true,
-        }
-      }
+  await setUpApp('afan', serverList, {
+    admin: {
+      [server1Addr]: true,
+      [server2Addr]: true,
+      [server3Addr]: true,
+      [server4Addr]: true,
     }
-  }).body.toString('utf-8')).result;
-  assert.deepEqual(CommonUtil.isFailedTx(_.get(createAppRes, 'result')), false);
-  if (!(await waitUntilTxFinalized(serverList, createAppRes.tx_hash))) {
-    console.log(`setUp(): Failed to check finalization of create app tx.`)
-  }
+  });
 }
 
 async function cleanUp() {
diff --git a/integration/blockchain.test.js b/integration/blockchain.test.js
index 203800233..e9ca3c0d1 100644
--- a/integration/blockchain.test.js
+++ b/integration/blockchain.test.js
@@ -25,7 +25,8 @@ const {
   waitUntilTxFinalized,
   waitForNewBlocks,
   waitUntilNodeSyncs,
-  parseOrLog
+  parseOrLog,
+  setUpApp
 } = require('../unittest/test-util');
 
 const ENV_VARIABLES = [
@@ -80,23 +81,23 @@ const LAST_BLOCK_NUMBER_ENDPOINT = '/last_block_number'
 
 // Data options
 RANDOM_OPERATION = [
-  ['set_value', {ref: 'test/comeonnnnnnn', value: 'testme'}],
-  ['set_value', {ref: 'test/comeonnnnnnn', value: 'no meeeee'}],
-  ['set_value', {ref: 'test/comeon/nnnnnn', value: 'through'}],
-  ['set_value', {ref: 'test/comeonnnnnnn/new', value: {'new': 'path'}}],
-  ['set_value', {ref: 'test/builed/some/deep', value: {'place': {'next': 1, 'level': 'down'}}}],
-  ['set_value', {ref: 'test/b/u/i/l/e/d/hel', value: 'very nested'}],
-  ['set_value', {ref: 'test/b/u/i/l/e/d/hel', value: {1: 2, 3: 4, 5: 6}}],
-  ['set_value', {ref: 'test/new/final/path', value: {'more': {'now': 12, 'hellloooo': 123}}}],
-  ['inc_value', {ref: 'test/balance/user1', value: 10}],
-  ['inc_value', {ref: 'test/balance/user1', value: 20}],
-  ['inc_value', {ref: 'test/balance/user2', value: 1}],
-  ['inc_value', {ref: 'test/balance/user2', value: 1}],
-  ['dec_value', {ref: 'test/balance/user1', value: 10000}],
-  ['dec_value', {ref: 'test/balance/user1', value: 10000}],
-  ['dec_value', {ref: 'test/balance/user2', value: 100002}],
-  ['set_rule', {ref: 'test/test_rule/', value: { ".write": "some rule config"}}],
-  ['set_function', {ref: 'test/test_function/', value: {
+  ['set_value', {ref: '/apps/test/comeonnnnnnn', value: 'testme'}],
+  ['set_value', {ref: '/apps/test/comeonnnnnnn', value: 'no meeeee'}],
+  ['set_value', {ref: '/apps/test/comeon/nnnnnn', value: 'through'}],
+  ['set_value', {ref: '/apps/test/comeonnnnnnn/new', value: {'new': 'path'}}],
+  ['set_value', {ref: '/apps/test/builed/some/deep', value: {'place': {'next': 1, 'level': 'down'}}}],
+  ['set_value', {ref: '/apps/test/b/u/i/l/e/d/hel', value: 'very nested'}],
+  ['set_value', {ref: '/apps/test/b/u/i/l/e/d/hel', value: {1: 2, 3: 4, 5: 6}}],
+  ['set_value', {ref: '/apps/test/new/final/path', value: {'more': {'now': 12, 'hellloooo': 123}}}],
+  ['inc_value', {ref: '/apps/test/balance/user1', value: 10}],
+  ['inc_value', {ref: '/apps/test/balance/user1', value: 20}],
+  ['inc_value', {ref: '/apps/test/balance/user2', value: 1}],
+  ['inc_value', {ref: '/apps/test/balance/user2', value: 1}],
+  ['dec_value', {ref: '/apps/test/balance/user1', value: 10000}],
+  ['dec_value', {ref: '/apps/test/balance/user1', value: 10000}],
+  ['dec_value', {ref: '/apps/test/balance/user2', value: 100002}],
+  ['set_rule', {ref: '/apps/test/test_rule/', value: { ".rule": { "write": "some rule config" }}}],
+  ['set_function', {ref: '/apps/test/test_function/', value: {
     ".function": {
       "fid": {
         "function_type": "REST",
@@ -106,7 +107,7 @@ RANDOM_OPERATION = [
       },
     }
   }}],
-  ['set_owner', {ref: 'test/test_owner/', value: {
+  ['set_owner', {ref: '/apps/test/test_owner/', value: {
     ".owner": {
       "owners": {
         "*": {
@@ -118,28 +119,28 @@ RANDOM_OPERATION = [
       }
     }
   }}],
-  ['set', {op_list: [{ref: 'test/increase/first/level', value: 10},
-      {ref: 'test/increase/first/level2', value: 20}]}],
-  ['set', {op_list: [{ref: 'test/increase/second/level/deeper', value: 20},
-      {ref: 'test/increase/second/level/deeper', value: 1000}]}],
-  ['set', {op_list: [{ref: 'test/increase', value: 1}]}],
-  ['set', {op_list: [{ref: 'test/new', value: 1}]}],
-  ['set', {op_list: [{ref: 'test/increase', value: 10000}]}],
-  ['set', {op_list: [{ref: 'test/b/u', value: 10000}]}],
-  ['set', {op_list: [{ref: 'test/builed/some/deep/place/next', value: 100002}]}],
-  ['batch', {tx_list: [{operation: {type: 'SET_VALUE', ref: 'test/comeonnnnnnn',
+  ['set', {op_list: [{ref: '/apps/test/increase/first/level', value: 10},
+      {ref: '/apps/test/increase/first/level2', value: 20}]}],
+  ['set', {op_list: [{ref: '/apps/test/increase/second/level/deeper', value: 20},
+      {ref: '/apps/test/increase/second/level/deeper', value: 1000}]}],
+  ['set', {op_list: [{ref: '/apps/test/increase', value: 1}]}],
+  ['set', {op_list: [{ref: '/apps/test/new', value: 1}]}],
+  ['set', {op_list: [{ref: '/apps/test/increase', value: 10000}]}],
+  ['set', {op_list: [{ref: '/apps/test/b/u', value: 10000}]}],
+  ['set', {op_list: [{ref: '/apps/test/builed/some/deep/place/next', value: 100002}]}],
+  ['batch', {tx_list: [{operation: {type: 'SET_VALUE', ref: '/apps/test/comeonnnnnnn',
       value: 'no meeeee'}}]}],
-  ['batch', {tx_list: [{operation: {type: 'SET_VALUE', ref: 'test/comeon/nnnnnn',
+  ['batch', {tx_list: [{operation: {type: 'SET_VALUE', ref: '/apps/test/comeon/nnnnnn',
       value: 'through'}}]}],
-  ['batch', {tx_list: [{operation: {type: 'SET_VALUE', ref: 'test/comeonnnnnnn/new',
+  ['batch', {tx_list: [{operation: {type: 'SET_VALUE', ref: '/apps/test/comeonnnnnnn/new',
       value: {'new': 'path'}}}]}],
-  ['batch', {tx_list: [{operation: {type: 'SET_VALUE', ref: 'test/builed/some/deep',
+  ['batch', {tx_list: [{operation: {type: 'SET_VALUE', ref: '/apps/test/builed/some/deep',
       value: {'place': {'next': 1, 'level': 'down'}}}}]}],
-  ['batch', {tx_list: [{operation: {type: 'SET_VALUE', ref: 'test/b/u/i/l/e/d/hel',
+  ['batch', {tx_list: [{operation: {type: 'SET_VALUE', ref: '/apps/test/b/u/i/l/e/d/hel',
       value: {'range': 1, 'another': 2}}}]}],
-  ['batch', {tx_list: [{operation: {type: 'SET_VALUE', ref: 'test/b/u/i/l/e/d/hel',
+  ['batch', {tx_list: [{operation: {type: 'SET_VALUE', ref: '/apps/test/b/u/i/l/e/d/hel',
       value: 'very nested'}}]}],
-  ['batch', {tx_list: [{operation: {type: 'SET_VALUE', ref: 'test/b/u/i/l/e/d/hel',
+  ['batch', {tx_list: [{operation: {type: 'SET_VALUE', ref: '/apps/test/b/u/i/l/e/d/hel',
       value: {1: 2, 3: 4, 5: 6}}}]}],
 ];
 
@@ -259,7 +260,25 @@ describe('Blockchain Cluster', () => {
         resolve();
       });
     }));
-    return Promise.all(promises);
+    await Promise.all(promises);
+
+    const server1Addr = parseOrLog(syncRequest(
+        'GET', server1 + '/get_address').body.toString('utf-8')).result;
+    const server2Addr = parseOrLog(syncRequest(
+        'GET', server2 + '/get_address').body.toString('utf-8')).result;
+    const server3Addr = parseOrLog(syncRequest(
+        'GET', server3 + '/get_address').body.toString('utf-8')).result;
+    const server4Addr = parseOrLog(syncRequest(
+        'GET', server4 + '/get_address').body.toString('utf-8')).result;
+
+    await setUpApp('test', serverList, {
+      admin: {
+        [server1Addr]: true,
+        [server2Addr]: true,
+        [server3Addr]: true,
+        [server4Addr]: true,
+      }
+    });
   });
 
   after(() => {
@@ -379,18 +398,18 @@ describe('Blockchain Cluster', () => {
         for (let j = 2; j < len; j++) { // voting starts with block#1 (included in block#2's last_votes)
           let voteSum = 0;
           const validators = Object.assign({}, blocks[j - 1].validators);
-          let totalStakedAmount = Object.values(validators).reduce((a, b) => { return a + b; }, 0);
+          let totalStakedAmount = Object.values(validators).reduce((acc, cur) => { return acc + cur.stake; }, 0);
           let majority = Math.floor(totalStakedAmount * ConsensusConsts.MAJORITY);
           for (let k = 0; k < blocks[j].last_votes.length; k++) {
             const vote = blocks[j].last_votes[k];
-            if (!blocks[j - 1].validators[vote.address]) {
+            if (!blocks[j - 1].validators[vote.address].stake) {
               assert.fail(`Invalid validator (${vote.address}) is validating block ${blocks[j - 1]}`);
             }
             if (vote.tx_body.operation.value.block_hash !== blocks[j - 1].hash) {
               assert.fail('Invalid vote included in last_votes');
             }
             if (vote.tx_body.operation.type === 'SET_VALUE' && vote.tx_body.operation.value.stake &&
-                blocks[j - 1].validators[vote.address]) {
+                blocks[j - 1].validators[vote.address].stake) {
               voteSum += vote.tx_body.operation.value.stake;
             }
           }
@@ -502,9 +521,9 @@ describe('Blockchain Cluster', () => {
       for (let i = 1; i < serverList.length; i++) {
         await sendTransactions(sentOperations);
         await waitForNewBlocks(serverList[i]);
-        body1 = parseOrLog(syncRequest('GET', server1 + GET_VALUE_ENDPOINT + '?ref=test')
+        body1 = parseOrLog(syncRequest('GET', server1 + GET_VALUE_ENDPOINT + '?ref=/apps/test')
             .body.toString('utf-8'));
-        body2 = parseOrLog(syncRequest('GET', serverList[i] + GET_VALUE_ENDPOINT + '?ref=test')
+        body2 = parseOrLog(syncRequest('GET', serverList[i] + GET_VALUE_ENDPOINT + '?ref=/apps/test')
             .body.toString('utf-8'));
         assert.deepEqual(body1.result, body2.result);
       }
@@ -574,7 +593,7 @@ describe('Blockchain Cluster', () => {
           const txHash = parseOrLog(syncRequest('POST', server2 + '/' + 'set_value',
                 {
                   json: {
-                    ref: '/test/nonce_test',
+                    ref: '/apps/test/nonce_test',
                     value: 'testing...'
                   }
                 }).body.toString('utf-8')).result.tx_hash;
diff --git a/integration/consensus.test.js b/integration/consensus.test.js
new file mode 100644
index 000000000..3f6257c90
--- /dev/null
+++ b/integration/consensus.test.js
@@ -0,0 +1,290 @@
+const _ = require('lodash');
+const chai = require('chai');
+const assert = chai.assert;
+const spawn = require('child_process').spawn;
+const rimraf = require('rimraf');
+const jayson = require('jayson/promise');
+const PROJECT_ROOT = require('path').dirname(__filename) + '/../';
+const TRACKER_SERVER = PROJECT_ROOT + 'tracker-server/index.js';
+const APP_SERVER = PROJECT_ROOT + 'client/index.js';
+const syncRequest = require('sync-request');
+const {
+  CURRENT_PROTOCOL_VERSION,
+  CHAINS_DIR,
+  PredefinedDbPaths,
+} = require('../common/constants');
+const CommonUtil = require('../common/common-util');
+const MAX_ITERATION = 200;
+const {
+  waitUntilTxFinalized,
+  waitForNewBlocks,
+  parseOrLog,
+  getLastBlock,
+} = require('../unittest/test-util');
+
+const MAX_NUM_VALIDATORS = 4;
+const ENV_VARIABLES = [
+  {
+    ACCOUNT_INDEX: 0, MIN_NUM_VALIDATORS: 3, MAX_NUM_VALIDATORS, EPOCH_MS: 1000, DEBUG: false,
+    CONSOLE_LOG: false, ENABLE_DEV_SET_CLIENT_API: true, ENABLE_GAS_FEE_WORKAROUND: true,
+    ADDITIONAL_OWNERS: 'test:unittest/data/owners_for_testing.json',
+    ADDITIONAL_RULES: 'test:unittest/data/rules_for_testing.json'
+  },
+  {
+    ACCOUNT_INDEX: 1, MIN_NUM_VALIDATORS: 3, MAX_NUM_VALIDATORS, EPOCH_MS: 1000, DEBUG: false,
+    CONSOLE_LOG: false, ENABLE_DEV_SET_CLIENT_API: true, ENABLE_GAS_FEE_WORKAROUND: true,
+    ADDITIONAL_OWNERS: 'test:unittest/data/owners_for_testing.json',
+    ADDITIONAL_RULES: 'test:unittest/data/rules_for_testing.json'
+  },
+  {
+    ACCOUNT_INDEX: 2, MIN_NUM_VALIDATORS: 3, MAX_NUM_VALIDATORS, EPOCH_MS: 1000, DEBUG: false,
+    CONSOLE_LOG: false, ENABLE_DEV_SET_CLIENT_API: true, ENABLE_GAS_FEE_WORKAROUND: true,
+    ADDITIONAL_OWNERS: 'test:unittest/data/owners_for_testing.json',
+    ADDITIONAL_RULES: 'test:unittest/data/rules_for_testing.json'
+  },
+  {
+    ACCOUNT_INDEX: 3, MIN_NUM_VALIDATORS: 3, MAX_NUM_VALIDATORS, EPOCH_MS: 1000, DEBUG: false,
+    CONSOLE_LOG: false, ENABLE_DEV_SET_CLIENT_API: true, ENABLE_GAS_FEE_WORKAROUND: true,
+    ADDITIONAL_OWNERS: 'test:unittest/data/owners_for_testing.json',
+    ADDITIONAL_RULES: 'test:unittest/data/rules_for_testing.json'
+  },
+  {
+    ACCOUNT_INDEX: 4, MIN_NUM_VALIDATORS: 3, MAX_NUM_VALIDATORS, EPOCH_MS: 1000, DEBUG: false,
+    CONSOLE_LOG: false, ENABLE_DEV_SET_CLIENT_API: true, ENABLE_GAS_FEE_WORKAROUND: true,
+    ADDITIONAL_OWNERS: 'test:unittest/data/owners_for_testing.json',
+    ADDITIONAL_RULES: 'test:unittest/data/rules_for_testing.json'
+  },
+];
+
+// Server configurations
+const server1 = 'http://localhost:' + String(8081 + Number(ENV_VARIABLES[0].ACCOUNT_INDEX))
+const server2 = 'http://localhost:' + String(8081 + Number(ENV_VARIABLES[1].ACCOUNT_INDEX))
+const server3 = 'http://localhost:' + String(8081 + Number(ENV_VARIABLES[2].ACCOUNT_INDEX))
+const server4 = 'http://localhost:' + String(8081 + Number(ENV_VARIABLES[3].ACCOUNT_INDEX))
+const server5 = 'http://localhost:' + String(8081 + Number(ENV_VARIABLES[4].ACCOUNT_INDEX))
+const serverList = [server1, server2, server3, server4, server5];
+
+const JSON_RPC_ENDPOINT = '/json-rpc';
+const JSON_RPC_GET_RECENT_BLOCK = 'ain_getRecentBlock';
+
+class Process {
+  constructor(application, envVariables) {
+    this.application = application;
+    this.envVariables = envVariables;
+    this.proc = null;
+  }
+
+  start(stdioInherit = false) {
+    if (this.proc) {
+      throw Error('Process already started');
+    }
+    const options = {
+      cwd: process.cwd(),
+      env: {
+        PATH: process.env.PATH,
+        ...this.envVariables,
+      },
+    }
+    if (stdioInherit) {
+      options.stdio = 'inherit';
+    }
+    this.proc = spawn('node', [this.application], options).on('error', (err) => {
+      console.error(
+          `Failed to start server${this.application} with ${this.envVariables} with error: ` +
+          err.message);
+    });
+  }
+
+  kill() {
+    this.proc.kill();
+    this.proc = null;
+  }
+}
+
+const SERVER_PROCS = [];
+for (let i = 0; i < ENV_VARIABLES.length; i++) {
+  SERVER_PROCS.push(new Process(APP_SERVER, ENV_VARIABLES[i]));
+}
+
+describe('Consensus', () => {
+  let trackerProc;
+  let jsonRpcClient;
+  let server4Addr;
+  let server5Addr;
+  const nodeAddressList = [];
+
+  before(async () => {
+    rimraf.sync(CHAINS_DIR);
+
+    const promises = [];
+    // Start up all servers
+    trackerProc = new Process(TRACKER_SERVER, { CONSOLE_LOG: false });
+    trackerProc.start(true);
+    await CommonUtil.sleep(2000);
+    for (let i = 0; i < SERVER_PROCS.length; i++) {
+      const proc = SERVER_PROCS[i];
+      proc.start(true);
+      await CommonUtil.sleep(2000);
+      const address =
+          parseOrLog(syncRequest('GET', serverList[i] + '/get_address').body.toString('utf-8')).result;
+      nodeAddressList.push(address);
+    };
+    jsonRpcClient = jayson.client.http(server2 + JSON_RPC_ENDPOINT);
+    promises.push(new Promise((resolve) => {
+      jsonRpcClient.request(JSON_RPC_GET_RECENT_BLOCK,
+          {protoVer: CURRENT_PROTOCOL_VERSION}, function(err, response) {
+        if (err) {
+          resolve();
+          throw err;
+        }
+        numBlocksOnStartup = response.result.result ? response.result.result.number : 0;
+        resolve();
+      });
+    }));
+    await Promise.all(promises);
+
+    server1Addr = parseOrLog(syncRequest(
+        'GET', server1 + '/get_address').body.toString('utf-8')).result;
+    server2Addr = parseOrLog(syncRequest(
+        'GET', server2 + '/get_address').body.toString('utf-8')).result;
+    server3Addr = parseOrLog(syncRequest(
+        'GET', server3 + '/get_address').body.toString('utf-8')).result;
+    server4Addr = parseOrLog(syncRequest(
+        'GET', server4 + '/get_address').body.toString('utf-8')).result;
+    server5Addr = parseOrLog(syncRequest(
+        'GET', server5 + '/get_address').body.toString('utf-8')).result;
+  });
+
+  after(() => {
+    // Teardown all servers
+    for (let i = 0; i < SERVER_PROCS.length; i++) {
+      SERVER_PROCS[i].kill();
+    }
+    trackerProc.kill();
+
+    rimraf.sync(CHAINS_DIR);
+  });
+
+  describe('Validators', () => {
+    it('Number of validators cannot exceed MAX_NUM_VALIDATORS', async () => {
+      // 1. server4 stakes 100000
+      const server4StakeRes = parseOrLog(syncRequest('POST', server4 + '/set_value', {json: {
+        ref: `/staking/consensus/${server4Addr}/0/stake/${Date.now()}/value`,
+        value: 100000,
+        nonce: -1
+      }}).body.toString('utf-8')).result;
+      if (!(await waitUntilTxFinalized([server4], server4StakeRes.tx_hash))) {
+        console.error(`Failed to check finalization of server4's staking tx.`);
+      }
+      // 2. server4 added to validators & can vote
+      let iterCount = 0;
+      let lastBlock = getLastBlock(server1);
+      while (!lastBlock.validators[server4Addr]) {
+        if (iterCount >= MAX_ITERATION) {
+          console.log(`Iteration count exceeded its limit before server4 becomes a validator`);
+          assert.fail(`server4 is not included in validators`);
+        }
+        lastBlock = getLastBlock(server1);
+        iterCount++;
+        await CommonUtil.sleep(200);
+      }
+      assert.deepEqual(lastBlock.validators[server4Addr][PredefinedDbPaths.PROPOSAL_RIGHT], false);
+      await waitForNewBlocks(server1, 1);
+      const server4Voted = parseOrLog(syncRequest(
+        'GET',
+        `${server1}/get_value?ref=/consensus/number/${lastBlock.number}/vote/${server4Addr}`
+      ).body.toString('utf-8')).result;
+      assert.deepEqual(server4Voted[PredefinedDbPaths.STAKE], 100000);
+      // 3. server5 stakes 100000
+      const server5StakeRes = parseOrLog(syncRequest('POST', server5 + '/set_value', {json: {
+        ref: `/staking/consensus/${server5Addr}/0/stake/${Date.now()}/value`,
+        value: 100000,
+        nonce: -1
+      }}).body.toString('utf-8')).result;
+      if (!(await waitUntilTxFinalized([server4], server5StakeRes.tx_hash))) {
+        console.error(`Failed to check finalization of server5's staking tx.`);
+      }
+      // 4. server5 added to validators & server4 is evicted (server5's expireAt > server4's expireAt)
+      iterCount = 0;
+      lastBlock = getLastBlock(server1);
+      while (!lastBlock.validators[server5Addr]) {
+        if (iterCount >= MAX_ITERATION) {
+          console.log(`Iteration count exceeded its limit before server5 becomes a validator`);
+          assert.fail(`server5 is not included in validators`);
+        }
+        lastBlock = getLastBlock(server1);
+        assert.deepEqual(Object.keys(lastBlock.validators).length, MAX_NUM_VALIDATORS);
+        iterCount++;
+        await CommonUtil.sleep(200);
+      }
+      assert.deepEqual(lastBlock.validators[server5Addr][PredefinedDbPaths.PROPOSAL_RIGHT], false);
+      await waitForNewBlocks(server1, 1);
+      const votes = parseOrLog(syncRequest(
+        'GET',
+        `${server1}/get_value?ref=/consensus/number/${lastBlock.number}/vote`
+      ).body.toString('utf-8')).result;
+      assert.deepEqual(votes[server4Addr], undefined);
+      assert.deepEqual(votes[server5Addr][PredefinedDbPaths.STAKE], 100000);
+    });
+
+    it('When more than MAX_NUM_VALIDATORS validators exist, validatators with bigger stakes get prioritized', async () => {
+      // 1. server4 stakes 10 more AIN
+      const server4StakeRes = parseOrLog(syncRequest('POST', server4 + '/set_value', {json: {
+        ref: `/staking/consensus/${server4Addr}/0/stake/${Date.now()}/value`,
+        value: 10,
+        nonce: -1
+      }}).body.toString('utf-8')).result;
+      if (!(await waitUntilTxFinalized([server4], server4StakeRes.tx_hash))) {
+        console.error(`Failed to check finalization of server4's staking tx.`);
+      }
+      // 2. server4 added to validators & server5 is evicted
+      let iterCount = 0;
+      let lastBlock = getLastBlock(server1);
+      while (!lastBlock.validators[server4Addr]) {
+        if (iterCount >= MAX_ITERATION) {
+          console.log(`Iteration count exceeded its limit before server4 becomes a validator`);
+          assert.fail(`server4 is not included in validators`);
+        }
+        lastBlock = getLastBlock(server1);
+        iterCount++;
+        await CommonUtil.sleep(200);
+      }
+      await waitForNewBlocks(server1, 1);
+      let votes = parseOrLog(syncRequest(
+        'GET',
+        `${server1}/get_value?ref=/consensus/number/${lastBlock.number}/vote`
+      ).body.toString('utf-8')).result;
+      assert.deepEqual(votes[server5Addr], undefined);
+      assert.deepEqual(votes[server4Addr][PredefinedDbPaths.STAKE], 100010);
+      // 3. server5 stakes 20 more AIN
+      const server5StakeRes = parseOrLog(syncRequest('POST', server5 + '/set_value', {json: {
+        ref: `/staking/consensus/${server5Addr}/0/stake/${Date.now()}/value`,
+        value: 20,
+        nonce: -1
+      }}).body.toString('utf-8')).result;
+      if (!(await waitUntilTxFinalized([server4], server5StakeRes.tx_hash))) {
+        console.error(`Failed to check finalization of server5's staking tx.`);
+      }
+      // 4. server5 added to validators & server4 is evicted
+      iterCount = 0;
+      lastBlock = getLastBlock(server1);
+      while (!lastBlock.validators[server5Addr]) {
+        if (iterCount >= MAX_ITERATION) {
+          console.log(`Iteration count exceeded its limit before server5 becomes a validator`);
+          assert.fail(`server5 is not included in validators`);
+        }
+        lastBlock = getLastBlock(server1);
+        assert.deepEqual(Object.keys(lastBlock.validators).length, MAX_NUM_VALIDATORS);
+        iterCount++;
+        await CommonUtil.sleep(200);
+      }
+      await waitForNewBlocks(server1, 1);
+      votes = parseOrLog(syncRequest(
+        'GET',
+        `${server1}/get_value?ref=/consensus/number/${lastBlock.number}/vote`
+      ).body.toString('utf-8')).result;
+      assert.deepEqual(votes[server4Addr], undefined);
+      assert.deepEqual(votes[server5Addr][PredefinedDbPaths.STAKE], 100020);
+    });
+  })
+});
\ No newline at end of file
diff --git a/integration/node.test.js b/integration/node.test.js
index 9f7c9eeeb..1c1895624 100644
--- a/integration/node.test.js
+++ b/integration/node.test.js
@@ -23,30 +23,41 @@ const {
   MICRO_AIN,
 } = require('../common/constants');
 const CommonUtil = require('../common/common-util');
-const { waitUntilTxFinalized, parseOrLog } = require('../unittest/test-util');
+const {
+  waitUntilTxFinalized,
+  parseOrLog,
+  setUpApp,
+  getLastBlockNumber,
+  waitForNewBlocks,
+  getBlockByNumber,
+} = require('../unittest/test-util');
 
 const ENV_VARIABLES = [
   {
     MIN_NUM_VALIDATORS: 4, ACCOUNT_INDEX: 0, EPOCH_MS: 1000, DEBUG: false,
     CONSOLE_LOG: false, ENABLE_DEV_SET_CLIENT_API: true, ENABLE_GAS_FEE_WORKAROUND: true,
+    MAX_BLOCK_NUMBERS_FOR_RECEIPTS: 100,
     ADDITIONAL_OWNERS: 'test:unittest/data/owners_for_testing.json',
     ADDITIONAL_RULES: 'test:unittest/data/rules_for_testing.json'
   },
   {
     MIN_NUM_VALIDATORS: 4, ACCOUNT_INDEX: 1, EPOCH_MS: 1000, DEBUG: false,
     CONSOLE_LOG: false, ENABLE_DEV_SET_CLIENT_API: true, ENABLE_GAS_FEE_WORKAROUND: true,
+    MAX_BLOCK_NUMBERS_FOR_RECEIPTS: 100,
     ADDITIONAL_OWNERS: 'test:unittest/data/owners_for_testing.json',
     ADDITIONAL_RULES: 'test:unittest/data/rules_for_testing.json'
   },
   {
     MIN_NUM_VALIDATORS: 4, ACCOUNT_INDEX: 2, EPOCH_MS: 1000, DEBUG: false,
     CONSOLE_LOG: false, ENABLE_DEV_SET_CLIENT_API: true, ENABLE_GAS_FEE_WORKAROUND: true,
+    MAX_BLOCK_NUMBERS_FOR_RECEIPTS: 100,
     ADDITIONAL_OWNERS: 'test:unittest/data/owners_for_testing.json',
     ADDITIONAL_RULES: 'test:unittest/data/rules_for_testing.json'
   },
   {
     MIN_NUM_VALIDATORS: 4, ACCOUNT_INDEX: 3, EPOCH_MS: 1000, DEBUG: false,
     CONSOLE_LOG: false, ENABLE_DEV_SET_CLIENT_API: true, ENABLE_GAS_FEE_WORKAROUND: true,
+    MAX_BLOCK_NUMBERS_FOR_RECEIPTS: 100,
     ADDITIONAL_OWNERS: 'test:unittest/data/owners_for_testing.json',
     ADDITIONAL_RULES: 'test:unittest/data/rules_for_testing.json'
   },
@@ -80,12 +91,12 @@ async function setUp() {
       op_list: [
         {
           type: 'SET_VALUE',
-          ref: 'test/test_value/some/path',
+          ref: '/apps/test/test_value/some/path',
           value: 100
         },
         {
           type: 'SET_VALUE',
-          ref: 'test/test_state_info/some/path',
+          ref: '/apps/test/test_state_info/some/path',
           value: {
             label1: {
               label11: 'value11',
@@ -96,14 +107,16 @@ async function setUp() {
         },
         {
           type: 'SET_RULE',
-          ref: '/test/test_rule/some/path',
+          ref: '/apps/test/test_rule/some/path',
           value: {
-            ".write": "auth.addr === 'abcd'"
+            ".rule": {
+              "write": "auth.addr === 'abcd'"
+            }
           }
         },
         {
           type: 'SET_FUNCTION',
-          ref: '/test/test_function/some/path',
+          ref: '/apps/test/test_function/some/path',
           value: {
             ".function": {
               "fid": {
@@ -117,7 +130,7 @@ async function setUp() {
         },
         {
           type: 'SET_OWNER',
-          ref: '/test/test_owner/some/path',
+          ref: '/apps/test/test_owner/some/path',
           value: {
             ".owner": {
               "owners": {
@@ -147,22 +160,22 @@ async function cleanUp() {
       op_list: [
         {
           type: 'SET_VALUE',
-          ref: 'test/test_value/some/path',
+          ref: '/apps/test/test_value/some/path',
           value: null
         },
         {
           type: 'SET_RULE',
-          ref: '/test/test_rule/some/path',
+          ref: '/apps/test/test_rule/some/path',
           value: null
         },
         {
           type: 'SET_FUNCTION',
-          ref: '/test/test_function/some/path',
+          ref: '/apps/test/test_function/some/path',
           value: null
         },
         {
           type: 'SET_OWNER',
-          ref: '/test/test_owner/some/path',
+          ref: '/apps/test/test_owner/some/path',
           value: null
         },
       ],
@@ -191,6 +204,24 @@ describe('Blockchain Node', () => {
     await CommonUtil.sleep(2000);
     server4_proc = startServer(APP_SERVER, 'server4', ENV_VARIABLES[3], true);
     await CommonUtil.sleep(2000);
+
+
+    const server1Addr = parseOrLog(syncRequest(
+        'GET', server1 + '/get_address').body.toString('utf-8')).result;
+    const server2Addr = parseOrLog(syncRequest(
+        'GET', server2 + '/get_address').body.toString('utf-8')).result;
+    const server3Addr = parseOrLog(syncRequest(
+        'GET', server3 + '/get_address').body.toString('utf-8')).result;
+    const server4Addr = parseOrLog(syncRequest(
+        'GET', server4 + '/get_address').body.toString('utf-8')).result;
+    await setUpApp('test', serverList, {
+      admin: {
+        [server1Addr]: true,
+        [server2Addr]: true,
+        [server3Addr]: true,
+        [server4Addr]: true,
+      }
+    });
   });
 
   after(() => {
@@ -215,7 +246,7 @@ describe('Blockchain Node', () => {
     describe('/get_value', () => {
       it('get_value', () => {
         const body = parseOrLog(syncRequest(
-            'GET', server1 + '/get_value?ref=test/test_value/some/path')
+            'GET', server1 + '/get_value?ref=/apps/test/test_value/some/path')
             .body.toString('utf-8'));
         assert.deepEqual(body, {code: 0, result: 100});
       })
@@ -224,7 +255,7 @@ describe('Blockchain Node', () => {
     describe('/get_function', () => {
       it('get_function', () => {
         const body = parseOrLog(syncRequest(
-            'GET', server1 + '/get_function?ref=/test/test_function/some/path')
+            'GET', server1 + '/get_function?ref=/apps/test/test_function/some/path')
             .body.toString('utf-8'));
         assert.deepEqual(body, {
           code: 0,
@@ -245,12 +276,14 @@ describe('Blockchain Node', () => {
     describe('/get_rule', () => {
       it('get_rule', () => {
         const body = parseOrLog(syncRequest(
-            'GET', server1 + '/get_rule?ref=/test/test_rule/some/path')
+            'GET', server1 + '/get_rule?ref=/apps/test/test_rule/some/path')
             .body.toString('utf-8'));
         assert.deepEqual(body, {
           code: 0,
           result: {
-            ".write": "auth.addr === 'abcd'"
+            ".rule": {
+              "write": "auth.addr === 'abcd'"
+            }
           }
         });
       })
@@ -259,7 +292,7 @@ describe('Blockchain Node', () => {
     describe('/get_owner', () => {
       it('get_owner', () => {
         const body = parseOrLog(syncRequest(
-            'GET', server1 + '/get_owner?ref=/test/test_owner/some/path')
+            'GET', server1 + '/get_owner?ref=/apps/test/test_owner/some/path')
             .body.toString('utf-8'));
         assert.deepEqual(body, {
           code: 0,
@@ -281,13 +314,13 @@ describe('Blockchain Node', () => {
 
     describe('/match_function', () => {
       it('match_function', () => {
-        const ref = "/test/test_function/some/path";
+        const ref = "/apps/test/test_function/some/path";
         const body = parseOrLog(syncRequest('GET', `${server1}/match_function?ref=${ref}`)
             .body.toString('utf-8'));
         assert.deepEqual(body, {code: 0, result: {
           "matched_path": {
-            "target_path": "/test/test_function/some/path",
-            "ref_path": "/test/test_function/some/path",
+            "target_path": "/apps/test/test_function/some/path",
+            "ref_path": "/apps/test/test_function/some/path",
             "path_vars": {},
           },
           "matched_config": {
@@ -299,7 +332,7 @@ describe('Blockchain Node', () => {
                 "service_name": "https://ainetwork.ai"
               }
             },
-            "path": "/test/test_function/some/path"
+            "path": "/apps/test/test_function/some/path"
           },
           "subtree_configs": []
         }});
@@ -308,18 +341,20 @@ describe('Blockchain Node', () => {
 
     describe('/match_rule', () => {
       it('match_rule', () => {
-        const ref = "/test/test_rule/some/path";
+        const ref = "/apps/test/test_rule/some/path";
         const body = parseOrLog(syncRequest('GET', `${server1}/match_rule?ref=${ref}`)
             .body.toString('utf-8'));
         assert.deepEqual(body, {code: 0, result: {
           "matched_path": {
-            "target_path": "/test/test_rule/some/path",
-            "ref_path": "/test/test_rule/some/path",
+            "target_path": "/apps/test/test_rule/some/path",
+            "ref_path": "/apps/test/test_rule/some/path",
             "path_vars": {},
           },
           "matched_config": {
-            "config": "auth.addr === 'abcd'",
-            "path": "/test/test_rule/some/path"
+            "config": {
+              "write": "auth.addr === 'abcd'"
+            },
+            "path": "/apps/test/test_rule/some/path"
           },
           "subtree_configs": []
         }});
@@ -328,12 +363,12 @@ describe('Blockchain Node', () => {
 
     describe('/match_owner', () => {
       it('match_owner', () => {
-        const ref = "/test/test_owner/some/path";
+        const ref = "/apps/test/test_owner/some/path";
         const body = parseOrLog(syncRequest('GET', `${server1}/match_owner?ref=${ref}`)
             .body.toString('utf-8'));
         assert.deepEqual(body, {code: 0, result: {
           "matched_path": {
-            "target_path": "/test/test_owner/some/path"
+            "target_path": "/apps/test/test_owner/some/path"
           },
           "matched_config": {
             "config": {
@@ -346,7 +381,7 @@ describe('Blockchain Node', () => {
                 }
               }
             },
-            "path": "/test/test_owner/some/path"
+            "path": "/apps/test/test_owner/some/path"
           }
         }});
       })
@@ -354,7 +389,7 @@ describe('Blockchain Node', () => {
 
     describe('/eval_rule', () => {
       it('eval_rule returning true', () => {
-        const ref = "/test/test_rule/some/path";
+        const ref = "/apps/test/test_rule/some/path";
         const value = "value";
         const address = "abcd";
         const request = { ref, value, address, protoVer: CURRENT_PROTOCOL_VERSION };
@@ -364,7 +399,7 @@ describe('Blockchain Node', () => {
       })
 
       it('eval_rule returning false', () => {
-        const ref = "/test/test_rule/some/path";
+        const ref = "/apps/test/test_rule/some/path";
         const value = "value";
         const address = "efgh";
         const request = { ref, value, address, protoVer: CURRENT_PROTOCOL_VERSION };
@@ -376,7 +411,7 @@ describe('Blockchain Node', () => {
 
     describe('/eval_owner', () => {
       it('eval_owner', () => {
-        const ref = "/test/test_owner/some/path";
+        const ref = "/apps/test/test_owner/some/path";
         const address = "abcd";
         const permission = "write_owner";
         const request = { ref, permission, address, protoVer: CURRENT_PROTOCOL_VERSION };
@@ -395,29 +430,29 @@ describe('Blockchain Node', () => {
           op_list: [
             {
               type: "GET_VALUE",
-              ref: "/test/test_value/some/path",
+              ref: "/apps/test/test_value/some/path",
             },
             {
               type: 'GET_FUNCTION',
-              ref: "/test/test_function/some/path",
+              ref: "/apps/test/test_function/some/path",
             },
             {
               type: 'GET_RULE',
-              ref: "/test/test_rule/some/path",
+              ref: "/apps/test/test_rule/some/path",
             },
             {
               type: 'GET_OWNER',
-              ref: "/test/test_owner/some/path",
+              ref: "/apps/test/test_owner/some/path",
             },
             {
               type: 'EVAL_RULE',
-              ref: "/test/test_rule/some/path",
+              ref: "/apps/test/test_rule/some/path",
               value: "value",
               address: "abcd"
             },
             {
               type: 'EVAL_OWNER',
-              ref: "/test/test_owner/some/path",
+              ref: "/apps/test/test_owner/some/path",
               permission: "write_owner",
               address: "abcd"
             }
@@ -440,7 +475,9 @@ describe('Blockchain Node', () => {
               }
             },
             {
-              ".write": "auth.addr === 'abcd'"
+              ".rule": {
+                "write": "auth.addr === 'abcd'"
+              }
             },
             {
               ".owner": {
@@ -490,9 +527,34 @@ describe('Blockchain Node', () => {
     describe('/get_state_info', () => {
       it('get_state_info', () => {
         const infoBody = parseOrLog(syncRequest(
-            'GET', server1 + `/get_state_info?ref=/values/test/test_state_info/some/path`)
+            'GET', server1 + `/get_state_info?ref=/values/apps/test/test_state_info/some/path`)
+                .body.toString('utf-8'));
+        // Erase some properties for stable comparison.
+        infoBody.result.tree_bytes = 0;
+        infoBody.result.version = 'erased';
+        assert.deepEqual(
+            infoBody, {
+              code: 0,
+              result: {
+                "proof_hash": "0x972cc2f16c7b20173eb9426d2698459a9351d38b5bca7d2af70124cd617bbeac",
+                "tree_bytes": 0,
+                "tree_height": 2,
+                "tree_size": 5,
+                "version": "erased",
+              }});
+      });
+    });
+
+    describe('/get_state_usage', () => {
+      it('get_state_usage', () => {
+        const body = parseOrLog(syncRequest(
+            'GET', server1 + `/get_state_usage?app_name=test`)
                 .body.toString('utf-8'));
-        assert.deepEqual(infoBody, { code: 0, result: { tree_height: 2, tree_size: 5 }});
+        assert.deepEqual(body.result, {
+          "tree_height": 17,
+          "tree_size": 52,
+          "tree_bytes": 10076,
+        });
       });
     });
 
@@ -503,7 +565,7 @@ describe('Blockchain Node', () => {
         return jsonRpcClient.request('ain_get', {
           protoVer: CURRENT_PROTOCOL_VERSION,
           type: 'GET_VALUE',
-          ref: "/test/test_value/some/path"
+          ref: "/apps/test/test_value/some/path"
         })
         .then(res => {
           expect(res.result.result).to.equal(expected);
@@ -513,14 +575,14 @@ describe('Blockchain Node', () => {
 
     describe('ain_matchFunction', () => {
       it('returns correct value', () => {
-        const ref = "/test/test_function/some/path";
+        const ref = "/apps/test/test_function/some/path";
         const request = { ref, protoVer: CURRENT_PROTOCOL_VERSION };
         return jayson.client.http(server1 + '/json-rpc').request('ain_matchFunction', request)
         .then(res => {
           assert.deepEqual(res.result.result, {
             "matched_path": {
-              "target_path": "/test/test_function/some/path",
-              "ref_path": "/test/test_function/some/path",
+              "target_path": "/apps/test/test_function/some/path",
+              "ref_path": "/apps/test/test_function/some/path",
               "path_vars": {},
             },
             "matched_config": {
@@ -532,7 +594,7 @@ describe('Blockchain Node', () => {
                   "service_name": "https://ainetwork.ai"
                 }
               },
-              "path": "/test/test_function/some/path"
+              "path": "/apps/test/test_function/some/path"
             },
             "subtree_configs": []
           });
@@ -542,19 +604,21 @@ describe('Blockchain Node', () => {
 
     describe('ain_matchRule', () => {
       it('returns correct value', () => {
-        const ref = "/test/test_rule/some/path";
+        const ref = "/apps/test/test_rule/some/path";
         const request = { ref, protoVer: CURRENT_PROTOCOL_VERSION };
         return jayson.client.http(server1 + '/json-rpc').request('ain_matchRule', request)
         .then(res => {
           assert.deepEqual(res.result.result, {
             "matched_path": {
-              "target_path": "/test/test_rule/some/path",
-              "ref_path": "/test/test_rule/some/path",
+              "target_path": "/apps/test/test_rule/some/path",
+              "ref_path": "/apps/test/test_rule/some/path",
               "path_vars": {},
             },
             "matched_config": {
-              "config": "auth.addr === 'abcd'",
-              "path": "/test/test_rule/some/path"
+              "config": {
+                "write": "auth.addr === 'abcd'"
+              },
+              "path": "/apps/test/test_rule/some/path"
             },
             "subtree_configs": []
           });
@@ -564,13 +628,13 @@ describe('Blockchain Node', () => {
 
     describe('ain_matchOwner', () => {
       it('returns correct value', () => {
-        const ref = "/test/test_owner/some/path";
+        const ref = "/apps/test/test_owner/some/path";
         const request = { ref, protoVer: CURRENT_PROTOCOL_VERSION };
         return jayson.client.http(server1 + '/json-rpc').request('ain_matchOwner', request)
         .then(res => {
           assert.deepEqual(res.result.result, {
             "matched_path": {
-              "target_path": "/test/test_owner/some/path"
+              "target_path": "/apps/test/test_owner/some/path"
             },
             "matched_config": {
               "config": {
@@ -583,7 +647,7 @@ describe('Blockchain Node', () => {
                   }
                 }
               },
-              "path": "/test/test_owner/some/path"
+              "path": "/apps/test/test_owner/some/path"
             }
           });
         })
@@ -592,7 +656,7 @@ describe('Blockchain Node', () => {
 
     describe('ain_evalRule', () => {
       it('returns true', () => {
-        const ref = "/test/test_rule/some/path";
+        const ref = "/apps/test/test_rule/some/path";
         const value = "value";
         const address = "abcd";
         const request = { ref, value, address, protoVer: CURRENT_PROTOCOL_VERSION };
@@ -603,7 +667,7 @@ describe('Blockchain Node', () => {
       })
 
       it('returns false', () => {
-        const ref = "/test/test_rule/some/path";
+        const ref = "/apps/test/test_rule/some/path";
         const value = "value";
         const address = "efgh";
         const request = { ref, value, address, protoVer: CURRENT_PROTOCOL_VERSION };
@@ -616,7 +680,7 @@ describe('Blockchain Node', () => {
 
     describe('ain_evalOwner', () => {
       it('returns correct value', () => {
-        const ref = "/test/test_owner/some/path";
+        const ref = "/apps/test/test_owner/some/path";
         const address = "abcd";
         const permission = "write_owner";
         const request = { ref, permission, address, protoVer: CURRENT_PROTOCOL_VERSION };
@@ -659,11 +723,36 @@ describe('Blockchain Node', () => {
 
     describe('ain_getStateInfo', () => {
       it('returns correct value', () => {
-        const ref = '/values/test/test_state_info/some/path';
+        const ref = '/values/apps/test/test_state_info/some/path';
         const request = { ref, protoVer: CURRENT_PROTOCOL_VERSION };
         return jayson.client.http(server1 + '/json-rpc').request('ain_getStateInfo', request)
         .then(res => {
-          assert.deepEqual(res.result.result, { tree_height: 2, tree_size: 5 });
+          const stateInfo = res.result.result;
+          // Erase some properties for stable comparison.
+          stateInfo.tree_bytes = 0;
+          stateInfo.version = 'erased';
+          assert.deepEqual(stateInfo, {
+            "proof_hash": "0x972cc2f16c7b20173eb9426d2698459a9351d38b5bca7d2af70124cd617bbeac",
+            "tree_height": 2,
+            "tree_size": 5,
+            "tree_bytes": 0,
+            "version": "erased"
+          });
+        })
+      })
+    })
+
+    describe('ain_getStateUsage', () => {
+      it('returns correct value', () => {
+        const request = { app_name: 'test', protoVer: CURRENT_PROTOCOL_VERSION };
+        return jayson.client.http(server1 + '/json-rpc').request('ain_getStateUsage', request)
+        .then(res => {
+          const stateUsage = res.result.result;
+          assert.deepEqual(stateUsage, {
+            "tree_height": 17,
+            "tree_size": 52,
+            "tree_bytes": 10076,
+          });
         })
       })
     })
@@ -730,12 +819,12 @@ describe('Blockchain Node', () => {
       it('set_value', async () => {
         // Check the original value.
         const resultBefore = parseOrLog(syncRequest(
-            'GET', server1 + '/get_value?ref=test/test_value/some/path')
+            'GET', server1 + '/get_value?ref=/apps/test/test_value/some/path')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultBefore, 100);
 
         const request = {
-          ref: 'test/test_value/some/path',
+          ref: '/apps/test/test_value/some/path',
           value: "some value"
         };
         const body = parseOrLog(syncRequest(
@@ -749,14 +838,14 @@ describe('Blockchain Node', () => {
           console.error(`Failed to check finalization of tx.`);
         }
         const resultAfter = parseOrLog(syncRequest(
-            'GET', server1 + '/get_value?ref=test/test_value/some/path')
+            'GET', server1 + '/get_value?ref=/apps/test/test_value/some/path')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultAfter, "some value");
       })
 
       it('set_value with timestamp', async () => {
         const request = {
-          ref: 'test/test_value/some/path',
+          ref: '/apps/test/test_value/some/path',
           value: "some value with timestamp",
           timestamp: Date.now(),
         };
@@ -771,14 +860,14 @@ describe('Blockchain Node', () => {
           console.error(`Failed to check finalization of tx.`);
         }
         const resultAfter = parseOrLog(syncRequest(
-            'GET', server1 + '/get_value?ref=test/test_value/some/path')
+            'GET', server1 + '/get_value?ref=/apps/test/test_value/some/path')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultAfter, "some value with timestamp");
       })
 
       it('set_value with nonce unordered (-1)', async () => {
         const request = {
-          ref: 'test/test_value/some/path',
+          ref: '/apps/test/test_value/some/path',
           value: "some value with nonce unordered",
           nonce: -1,
         };
@@ -793,7 +882,7 @@ describe('Blockchain Node', () => {
           console.error(`Failed to check finalization of tx.`);
         }
         const resultAfter = parseOrLog(syncRequest(
-            'GET', server1 + '/get_value?ref=test/test_value/some/path')
+            'GET', server1 + '/get_value?ref=/apps/test/test_value/some/path')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultAfter, "some value with nonce unordered");
       })
@@ -802,7 +891,7 @@ describe('Blockchain Node', () => {
         const nonce = parseOrLog(
             syncRequest('GET', server1 + '/get_nonce').body.toString('utf-8')).result;
         const request = {
-          ref: 'test/test_value/some/path',
+          ref: '/apps/test/test_value/some/path',
           value: "some value with numbered nonce",
           nonce,
         };
@@ -817,36 +906,47 @@ describe('Blockchain Node', () => {
           console.error(`Failed to check finalization of tx.`);
         }
         const resultAfter = parseOrLog(syncRequest(
-            'GET', server1 + '/get_value?ref=test/test_value/some/path')
+            'GET', server1 + '/get_value?ref=/apps/test/test_value/some/path')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultAfter, "some value with numbered nonce");
       })
 
-      it('set_value with failing operation', () => {
+      it('set_value with failing operation', async () => {
         // Check the original value.
         const resultBefore = parseOrLog(syncRequest(
-            'GET', server1 + '/get_value?ref=some/wrong/path')
+            'GET', server1 + '/get_value?ref=/apps/some/wrong/path')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultBefore, null);
 
-        const request = {ref: 'some/wrong/path', value: "some other value"};
+        const request = {ref: '/apps/some/wrong/path', value: "some other value"};
         const body = parseOrLog(syncRequest('POST', server1 + '/set_value', {json: request})
           .body.toString('utf-8'));
         assert.deepEqual(_.get(body, 'result.result'), {
+          "bandwidth_gas_amount": 1,
           "code": 103,
-          "error_message": "No .write permission on: some/wrong/path",
-          "gas_amount": 0,
+          "error_message": "No write permission on: /apps/some/wrong/path",
+          "gas_amount_charged": 0,
           "gas_amount_total": {
-            "app": {},
-            "service": 0
+            "bandwidth": {
+              "app": {
+                "some": 1
+              },
+              "service": 0
+            },
+            "state": {
+              "service": 0
+            }
           },
           "gas_cost_total": 0
         });
         expect(body.code).to.equal(1);
+        if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+          console.error(`Failed to check finalization of tx.`);
+        }
 
         // Confirm that the original value is not altered.
         const resultAfter = parseOrLog(syncRequest(
-            'GET', server1 + '/get_value?ref=some/wrong/path')
+            'GET', server1 + '/get_value?ref=/apps/some/wrong/path')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultAfter, null);
       })
@@ -856,11 +956,11 @@ describe('Blockchain Node', () => {
       it('inc_value', async () => {
         // Check the original value.
         const resultBefore = parseOrLog(syncRequest(
-            'GET', server1 + '/get_value?ref=some/wrong/path2')
+            'GET', server1 + '/get_value?ref=/apps/some/wrong/path2')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultBefore, null);
 
-        const request = {ref: "test/test_value/some/path2", value: 10};
+        const request = {ref: "/apps/test/test_value/some/path2", value: 10};
         const body = parseOrLog(syncRequest('POST', server1 + '/inc_value', {json: request})
           .body.toString('utf-8'));
         assert.deepEqual(_.get(body, 'result.result.code'), 0);
@@ -872,36 +972,47 @@ describe('Blockchain Node', () => {
           console.error(`Failed to check finalization of tx.`);
         }
         const resultAfter = parseOrLog(syncRequest(
-            'GET', server1 + '/get_value?ref=test/test_value/some/path2')
+            'GET', server1 + '/get_value?ref=/apps/test/test_value/some/path2')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultAfter, 10);
       })
 
-      it('inc_value with a failing operation', () => {
+      it('inc_value with a failing operation', async () => {
         // Check the original value.
         const resultBefore = parseOrLog(syncRequest(
-            'GET', server1 + '/get_value?ref=some/wrong/path2')
+            'GET', server1 + '/get_value?ref=/apps/some/wrong/path2')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultBefore, null);
 
-        const request = {ref: "some/wrong/path2", value: 10};
+        const request = {ref: "/apps/some/wrong/path2", value: 10};
         const body = parseOrLog(syncRequest('POST', server1 + '/inc_value', {json: request})
           .body.toString('utf-8'));
         assert.deepEqual(_.get(body, 'result.result'), {
+          "bandwidth_gas_amount": 1,
           "code": 103,
-          "error_message": "No .write permission on: some/wrong/path2",
-          "gas_amount": 0,
+          "error_message": "No write permission on: /apps/some/wrong/path2",
+          "gas_amount_charged": 0,
           "gas_amount_total": {
-            "app": {},
-            "service": 0
+            "bandwidth": {
+              "app": {
+                "some": 1
+              },
+              "service": 0
+            },
+            "state": {
+              "service": 0
+            }
           },
           "gas_cost_total": 0
         });
         expect(body.code).to.equal(1);
+        if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+          console.error(`Failed to check finalization of tx.`);
+        }
 
         // Confirm that the original value is not altered.
         const resultAfter = parseOrLog(syncRequest(
-            'GET', server1 + '/get_value?ref=some/wrong/path2')
+            'GET', server1 + '/get_value?ref=/apps/some/wrong/path2')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultAfter, null);
       })
@@ -911,11 +1022,11 @@ describe('Blockchain Node', () => {
       it('dec_value', async () => {
         // Check the original value.
         const resultBefore = parseOrLog(syncRequest(
-            'GET', server1 + '/get_value?ref=some/wrong/path3')
+            'GET', server1 + '/get_value?ref=/apps/some/wrong/path3')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultBefore, null);
 
-        const request = {ref: "test/test_value/some/path3", value: 10};
+        const request = {ref: "/apps/test/test_value/some/path3", value: 10};
         const body = parseOrLog(syncRequest('POST', server1 + '/dec_value', {json: request})
           .body.toString('utf-8'));
         assert.deepEqual(_.get(body, 'result.result.code'), 0);
@@ -927,36 +1038,47 @@ describe('Blockchain Node', () => {
           console.error(`Failed to check finalization of tx.`);
         }
         const resultAfter = parseOrLog(syncRequest(
-            'GET', server1 + '/get_value?ref=test/test_value/some/path3')
+            'GET', server1 + '/get_value?ref=/apps/test/test_value/some/path3')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultAfter, -10);
       })
 
-      it('dec_value with a failing operation', () => {
+      it('dec_value with a failing operation', async () => {
         // Check the original value.
         const resultBefore = parseOrLog(syncRequest(
-            'GET', server1 + '/get_value?ref=some/wrong/path3')
+            'GET', server1 + '/get_value?ref=/apps/some/wrong/path3')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultBefore, null);
 
-        const request = {ref: "some/wrong/path3", value: 10};
+        const request = {ref: "/apps/some/wrong/path3", value: 10};
         const body = parseOrLog(syncRequest('POST', server1 + '/dec_value', {json: request})
           .body.toString('utf-8'));
         assert.deepEqual(_.get(body, 'result.result'), {
+          "bandwidth_gas_amount": 1,
           "code": 103,
-          "error_message": "No .write permission on: some/wrong/path3",
-          "gas_amount": 0,
+          "error_message": "No write permission on: /apps/some/wrong/path3",
+          "gas_amount_charged": 0,
           "gas_amount_total": {
-            "app": {},
-            "service": 0
+            "bandwidth": {
+              "app": {
+                "some": 1
+              },
+              "service": 0
+            },
+            "state": {
+              "service": 0
+            }
           },
           "gas_cost_total": 0
         });
         expect(body.code).to.equal(1);
+        if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+          console.error(`Failed to check finalization of tx.`);
+        }
 
         // Confirm that the original value is not altered.
         const resultAfter = parseOrLog(syncRequest(
-            'GET', server1 + '/get_value?ref=some/wrong/path3')
+            'GET', server1 + '/get_value?ref=/apps/some/wrong/path3')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultAfter, null);
       })
@@ -966,7 +1088,7 @@ describe('Blockchain Node', () => {
       it('set_function', async () => {
         // Check the original function.
         const resultBefore = parseOrLog(syncRequest(
-            'GET', server1 + '/get_function?ref=test/test_function/some/path')
+            'GET', server1 + '/get_function?ref=/apps/test/test_function/some/path')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultBefore, {
           ".function": {
@@ -980,7 +1102,7 @@ describe('Blockchain Node', () => {
         });
 
         const request = {
-          ref: "/test/test_function/some/path",
+          ref: "/apps/test/test_function/some/path",
           value: {
             ".function": {
               "fid": {
@@ -1004,7 +1126,7 @@ describe('Blockchain Node', () => {
           console.error(`Failed to check finalization of tx.`);
         }
         const resultAfter = parseOrLog(syncRequest(
-            'GET', server1 + '/get_function?ref=test/test_function/some/path')
+            'GET', server1 + '/get_function?ref=/apps/test/test_function/some/path')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultAfter, {
           ".function": {
@@ -1018,15 +1140,15 @@ describe('Blockchain Node', () => {
         });
       })
 
-      it('set_function with a failing operation', () => {
+      it('set_function with a failing operation', async () => {
         // Check the original function.
         const resultBefore = parseOrLog(syncRequest(
-            'GET', server1 + '/get_function?ref=some/wrong/path')
+            'GET', server1 + '/get_function?ref=/apps/some/wrong/path')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultBefore, null);
 
         const request = {
-          ref: "/some/wrong/path",
+          ref: "/apps/some/wrong/path",
           value: {
             ".function": {
               "fid": {
@@ -1042,20 +1164,31 @@ describe('Blockchain Node', () => {
             'POST', server1 + '/set_function', {json: request})
             .body.toString('utf-8'));
         assert.deepEqual(_.get(body, 'result.result'), {
+          "bandwidth_gas_amount": 1,
           "code": 404,
-          "error_message": "No write_function permission on: /some/wrong/path",
-          "gas_amount": 0,
+          "error_message": "No write_function permission on: /apps/some/wrong/path",
+          "gas_amount_charged": 0,
           "gas_amount_total": {
-            "app": {},
-            "service": 0
+            "bandwidth": {
+              "app": {
+                "some": 1
+              },
+              "service": 0
+            },
+            "state": {
+              "service": 0
+            }
           },
           "gas_cost_total": 0
         });
         expect(body.code).to.equal(1);
+        if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+          console.error(`Failed to check finalization of tx.`);
+        }
 
         // Confirm that the original function is not altered.
         const resultAfter = parseOrLog(syncRequest(
-            'GET', server1 + '/get_function?ref=some/wrong/path')
+            'GET', server1 + '/get_function?ref=/apps/some/wrong/path')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultAfter, null);
       })
@@ -1065,16 +1198,20 @@ describe('Blockchain Node', () => {
       it('set_rule', async () => {
         // Check the original rule.
         const resultBefore = parseOrLog(syncRequest(
-            'GET', server1 + '/get_rule?ref=test/test_rule/some/path')
+            'GET', server1 + '/get_rule?ref=/apps/test/test_rule/some/path')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultBefore, {
-          ".write": "auth.addr === 'abcd'"
+          ".rule": {
+            "write": "auth.addr === 'abcd'"
+          }
         });
 
         const request = {
-          ref: "/test/test_rule/some/path",
+          ref: "/apps/test/test_rule/some/path",
           value: {
-            ".write": "some other rule config"
+            ".rule": {
+              "write": "some other rule config"
+            }
           }
         };
         const body = parseOrLog(syncRequest('POST', server1 + '/set_rule', {json: request})
@@ -1088,43 +1225,58 @@ describe('Blockchain Node', () => {
           console.error(`Failed to check finalization of tx.`);
         }
         const resultAfter = parseOrLog(syncRequest(
-            'GET', server1 + '/get_rule?ref=test/test_rule/some/path')
+            'GET', server1 + '/get_rule?ref=/apps/test/test_rule/some/path')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultAfter, {
-          ".write": "some other rule config"
+          ".rule": {
+            "write": "some other rule config"
+          }
         });
       })
 
-      it('set_rule with a failing operation', () => {
+      it('set_rule with a failing operation', async () => {
         // Check the original rule.
         const resultBefore = parseOrLog(syncRequest(
-            'GET', server1 + '/get_rule?ref=some/wrong/path')
+            'GET', server1 + '/get_rule?ref=/apps/some/wrong/path')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultBefore, null);
 
         const request = {
-          ref: "/some/wrong/path",
+          ref: "/apps/some/wrong/path",
           value: {
-            ".write": "some other rule config"
+            ".rule": {
+              "write": "some other rule config"
+            }
           }
         };
         const body = parseOrLog(syncRequest('POST', server1 + '/set_rule', {json: request})
             .body.toString('utf-8'));
         assert.deepEqual(_.get(body, 'result.result'), {
+          "bandwidth_gas_amount": 1,
           "code": 503,
-          "error_message": "No write_rule permission on: /some/wrong/path",
-          "gas_amount": 0,
+          "error_message": "No write_rule permission on: /apps/some/wrong/path",
+          "gas_amount_charged": 0,
           "gas_amount_total": {
-            "app": {},
-            "service": 0
+            "bandwidth": {
+              "app": {
+                "some": 1
+              },
+              "service": 0
+            },
+            "state": {
+              "service": 0
+            }
           },
           "gas_cost_total": 0
         });
         expect(body.code).to.equal(1);
+        if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+          console.error(`Failed to check finalization of tx.`);
+        }
 
         // Confirm that the original rule is not altered.
         const resultAfter = parseOrLog(syncRequest(
-            'GET', server1 + '/get_rule?ref=some/wrong/path')
+            'GET', server1 + '/get_rule?ref=/apps/some/wrong/path')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultAfter, null);
       })
@@ -1134,7 +1286,7 @@ describe('Blockchain Node', () => {
       it('set_owner', async () => {
         // Check the original owner.
         const resultBefore = parseOrLog(syncRequest(
-            'GET', server1 + '/get_owner?ref=test/test_owner/some/path')
+            'GET', server1 + '/get_owner?ref=/apps/test/test_owner/some/path')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultBefore, {
           ".owner": {
@@ -1150,7 +1302,7 @@ describe('Blockchain Node', () => {
         });
 
         const request = {
-          ref: "/test/test_owner/some/path",
+          ref: "/apps/test/test_owner/some/path",
           value: {
             ".owner": {
               "owners": {
@@ -1175,7 +1327,7 @@ describe('Blockchain Node', () => {
           console.error(`Failed to check finalization of tx.`);
         }
         const resultAfter = parseOrLog(syncRequest(
-            'GET', server1 + '/get_owner?ref=test/test_owner/some/path')
+            'GET', server1 + '/get_owner?ref=/apps/test/test_owner/some/path')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultAfter, {
           ".owner": {
@@ -1191,15 +1343,15 @@ describe('Blockchain Node', () => {
         });
       })
 
-      it('set_owner with a failing operation', () => {
+      it('set_owner with a failing operation', async () => {
         // Check the original owner.
         const resultBefore = parseOrLog(syncRequest(
-            'GET', server1 + '/get_owner?ref=some/wrong/path')
+            'GET', server1 + '/get_owner?ref=/apps/some/wrong/path')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultBefore, null);
 
         const request = {
-          ref: "/some/wrong/path",
+          ref: "/apps/some/wrong/path",
           value: {
             ".owner": {
               "owners": {
@@ -1216,20 +1368,31 @@ describe('Blockchain Node', () => {
         const body = parseOrLog(syncRequest('POST', server1 + '/set_owner', {json: request})
             .body.toString('utf-8'));
         assert.deepEqual(_.get(body, 'result.result'), {
+          "bandwidth_gas_amount": 1,
           "code": 603,
-          "error_message": "No write_owner or branch_owner permission on: /some/wrong/path",
-          "gas_amount": 0,
+          "error_message": "No write_owner or branch_owner permission on: /apps/some/wrong/path",
+          "gas_amount_charged": 0,
           "gas_amount_total": {
-            "app": {},
-            "service": 0
+            "bandwidth": {
+              "app": {
+                "some": 1
+              },
+              "service": 0
+            },
+            "state": {
+              "service": 0
+            }
           },
           "gas_cost_total": 0
         });
         expect(body.code).to.equal(1);
+        if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+          console.error(`Failed to check finalization of tx.`);
+        }
 
         // Confirm that the original owner is not altered.
         const resultAfter = parseOrLog(syncRequest(
-            'GET', server1 + '/get_owner?ref=some/wrong/path')
+            'GET', server1 + '/get_owner?ref=/apps/some/wrong/path')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultAfter, null);
       })
@@ -1239,7 +1402,7 @@ describe('Blockchain Node', () => {
       it('set with successful operations', async () => {
         // Check the original value.
         const resultBefore = parseOrLog(syncRequest(
-            'GET', server1 + '/get_value?ref=test/test_value/some100/path')
+            'GET', server1 + '/get_value?ref=/apps/test/test_value/some100/path')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultBefore, null);
 
@@ -1247,22 +1410,22 @@ describe('Blockchain Node', () => {
           op_list: [
             {
               // Default type: SET_VALUE
-              ref: "test/test_value/some100/path",
+              ref: "/apps/test/test_value/some100/path",
               value: "some other100 value",
             },
             {
               type: 'INC_VALUE',
-              ref: "test/test_value/some100/path1",
+              ref: "/apps/test/test_value/some100/path1",
               value: 10
             },
             {
               type: 'DEC_VALUE',
-              ref: "test/test_value/some100/path2",
+              ref: "/apps/test/test_value/some100/path2",
               value: 10
             },
             {
               type: 'SET_FUNCTION',
-              ref: "/test/test_function/other100/path",
+              ref: "/apps/test/test_function/other100/path",
               value: {
                 ".function": {
                   "fid": {
@@ -1276,14 +1439,16 @@ describe('Blockchain Node', () => {
             },
             {
               type: 'SET_RULE',
-              ref: "/test/test_rule/other100/path",
+              ref: "/apps/test/test_rule/other100/path",
               value: {
-                ".write": "some other100 rule config"
+                ".rule": {
+                  "write": "some other100 rule config"
+                }
               }
             },
             {
               type: 'SET_OWNER',
-              ref: "/test/test_owner/other100/path",
+              ref: "/apps/test/test_owner/other100/path",
               value: {
                 ".owner": {
                   "owners": {
@@ -1302,35 +1467,46 @@ describe('Blockchain Node', () => {
         const body = parseOrLog(syncRequest('POST', server1 + '/set', {json: request})
             .body.toString('utf-8'));
         assert.deepEqual(_.get(body, 'result.result'), {
-          "result_list": [
-            {
+          "result_list": {
+            "0": {
               "code": 0,
-              "gas_amount": 1
+              "bandwidth_gas_amount": 1
             },
-            {
+            "1": {
               "code": 0,
-              "gas_amount": 1
+              "bandwidth_gas_amount": 1
             },
-            {
+            "2": {
               "code": 0,
-              "gas_amount": 1
+              "bandwidth_gas_amount": 1
             },
-            {
+            "3": {
               "code": 0,
-              "gas_amount": 1
+              "bandwidth_gas_amount": 1
             },
-            {
+            "4": {
               "code": 0,
-              "gas_amount": 1
+              "bandwidth_gas_amount": 1
             },
-            {
+            "5": {
               "code": 0,
-              "gas_amount": 1
+              "bandwidth_gas_amount": 1
             },
-          ],
+          },
+          "gas_amount_charged": 1552,
           "gas_amount_total": {
-            "service": 6,
-            "app": {}
+            "bandwidth": {
+              "app": {
+                "test": 6
+              },
+              "service": 0
+            },
+            "state": {
+              "app": {
+                "test": 3070
+              },
+              "service": 1552
+            }
           },
           "gas_cost_total": 0
         });
@@ -1342,15 +1518,15 @@ describe('Blockchain Node', () => {
           console.error(`Failed to check finalization of tx.`);
         }
         const resultAfter = parseOrLog(syncRequest(
-            'GET', server1 + '/get_value?ref=test/test_value/some100/path')
+            'GET', server1 + '/get_value?ref=/apps/test/test_value/some100/path')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultAfter, 'some other100 value');
       })
 
-      it('set with a failing operation', () => {
+      it('set with a failing operation', async () => {
         // Check the original value.
         const resultBefore = parseOrLog(syncRequest(
-            'GET', server1 + '/get_value?ref=test/test_value/some101/path')
+            'GET', server1 + '/get_value?ref=/apps/test/test_value/some101/path')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultBefore, null);
 
@@ -1358,27 +1534,27 @@ describe('Blockchain Node', () => {
           op_list: [
             {
               // Default type: SET_VALUE
-              ref: "test/test_value/some101/path",
+              ref: "/apps/test/test_value/some101/path",
               value: "some other101 value",
             },
             {
               type: 'INC_VALUE',
-              ref: "test/test_value/some101/path2",
+              ref: "/apps/test/test_value/some101/path2",
               value: 10
             },
             {
               type: 'DEC_VALUE',
-              ref: "test/test_value/some101/path3",
+              ref: "/apps/test/test_value/some101/path3",
               value: 10
             },
             {
               type: 'SET_VALUE',
-              ref: "some/wrong/path",
+              ref: "/apps/some/wrong/path",
               value: "some other101 value",
             },
             {
               type: 'SET_FUNCTION',
-              ref: "/test/test_function/other101/path",
+              ref: "/apps/test/test_function/other101/path",
               value: {
                 ".function": {
                   "fid": {
@@ -1392,14 +1568,16 @@ describe('Blockchain Node', () => {
             },
             {
               type: 'SET_RULE',
-              ref: "/test/test_rule/other101/path",
+              ref: "/apps/test/test_rule/other101/path",
               value: {
-                ".write": "some other101 rule config"
+                ".rule": {
+                  "write": "some other101 rule config"
+                }
               }
             },
             {
               type: 'SET_OWNER',
-              ref: "/test/test_owner/other101/path",
+              ref: "/apps/test/test_owner/other101/path",
               value: {
                 ".owner": "some other101 owner config"
               }
@@ -1409,36 +1587,48 @@ describe('Blockchain Node', () => {
         const body = parseOrLog(syncRequest('POST', server1 + '/set', {json: request})
             .body.toString('utf-8'));
         assert.deepEqual(_.get(body, 'result.result'), {
-          "result_list": [
-            {
+          "result_list": {
+            "0": {
               "code": 0,
-              "gas_amount": 1
+              "bandwidth_gas_amount": 1
             },
-            {
+            "1": {
               "code": 0,
-              "gas_amount": 1
+              "bandwidth_gas_amount": 1
             },
-            {
+            "2": {
               "code": 0,
-              "gas_amount": 1
+              "bandwidth_gas_amount": 1
             },
-            {
+            "3": {
               "code": 103,
-              "error_message": "No .write permission on: some/wrong/path",
-              "gas_amount": 0
+              "error_message": "No write permission on: /apps/some/wrong/path",
+              "bandwidth_gas_amount": 1
             }
-          ],
+          },
+          "gas_amount_charged": 0,
           "gas_amount_total": {
-            "app": {},
-            "service": 3
+            "bandwidth": {
+              "app": {
+                "some": 1,
+                "test": 3
+              },
+              "service": 0
+            },
+            "state": {
+              "service": 0
+            }
           },
           "gas_cost_total": 0
         });
         expect(body.code).to.equal(1);
+        if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+          console.error(`Failed to check finalization of tx.`);
+        }
 
         // Confirm that the original value is not altered.
         const resultAfter = parseOrLog(syncRequest(
-            'GET', server1 + '/get_value?ref=test/test_value/some101/path')
+            'GET', server1 + '/get_value?ref=/apps/test/test_value/some101/path')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultAfter, null);
       })
@@ -1450,11 +1640,11 @@ describe('Blockchain Node', () => {
             'GET', server1 + '/get_address').body.toString('utf-8')).result;
         // Check the original value.
         const resultBefore = parseOrLog(syncRequest(
-            'GET', server1 + '/get_value?ref=test/test_value/some200/path')
+            'GET', server1 + '/get_value?ref=/apps/test/test_value/some200/path')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultBefore, null);
         const resultBefore2 = parseOrLog(syncRequest(
-            'GET', server1 + '/get_value?ref=test/test_value/some201/path')
+            'GET', server1 + '/get_value?ref=/apps/test/test_value/some201/path')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultBefore2, null);
 
@@ -1465,7 +1655,7 @@ describe('Blockchain Node', () => {
             {
               operation: {
                 // Default type: SET_VALUE
-                ref: "test/test_value/some200/path",
+                ref: "/apps/test/test_value/some200/path",
                 value: "some other200 value",
               },
               timestamp: Date.now(),
@@ -1474,7 +1664,7 @@ describe('Blockchain Node', () => {
             {
               operation: {
                 type: 'INC_VALUE',
-                ref: "test/test_value/some200/path2",
+                ref: "/apps/test/test_value/some200/path2",
                 value: 10
               },
               timestamp: Date.now(),
@@ -1483,7 +1673,7 @@ describe('Blockchain Node', () => {
             {
               operation: {
                 type: 'DEC_VALUE',
-                ref: "test/test_value/some200/path3",
+                ref: "/apps/test/test_value/some200/path3",
                 value: 10
               },
               timestamp: Date.now(),
@@ -1492,7 +1682,7 @@ describe('Blockchain Node', () => {
             {
               operation: {
                 type: 'SET_FUNCTION',
-                ref: "/test/test_function/other200/path",
+                ref: "/apps/test/test_function/other200/path",
                 value: {
                   ".function": {
                     "fid": {
@@ -1510,9 +1700,11 @@ describe('Blockchain Node', () => {
             {
               operation: {
                 type: 'SET_RULE',
-                ref: "/test/test_rule/other200/path",
+                ref: "/apps/test/test_rule/other200/path",
                 value: {
-                  ".write": "some other200 rule config"
+                  ".rule": {
+                    "write": "some other200 rule config"
+                  }
                 }
               },
               timestamp: Date.now(),
@@ -1521,7 +1713,7 @@ describe('Blockchain Node', () => {
             {
               operation: {
                 type: 'SET_OWNER',
-                ref: "/test/test_owner/other200/path",
+                ref: "/apps/test/test_owner/other200/path",
                 value: {
                   ".owner": {
                     "owners": {
@@ -1544,22 +1736,22 @@ describe('Blockchain Node', () => {
                 op_list: [
                   {
                     type: "SET_VALUE",
-                    ref: "test/test_value/some201/path",
+                    ref: "/apps/test/test_value/some201/path",
                     value: "some other201 value",
                   },
                   {
                     type: 'INC_VALUE',
-                    ref: "test/test_value/some201/path2",
+                    ref: "/apps/test/test_value/some201/path2",
                     value: 5
                   },
                   {
                     type: 'DEC_VALUE',
-                    ref: "test/test_value/some201/path3",
+                    ref: "/apps/test/test_value/some201/path3",
                     value: 5
                   },
                   {
                     type: 'SET_FUNCTION',
-                    ref: "/test/test_function/other201/path",
+                    ref: "/apps/test/test_function/other201/path",
                     value: {
                       ".function": {
                         "fid": {
@@ -1573,14 +1765,16 @@ describe('Blockchain Node', () => {
                   },
                   {
                     type: 'SET_RULE',
-                    ref: "/test/test_rule/other201/path",
+                    ref: "/apps/test/test_rule/other201/path",
                     value: {
-                      ".write": "some other201 rule config"
+                      ".rule": {
+                        "write": "some other201 rule config"
+                      }
                     }
                   },
                   {
                     type: 'SET_OWNER',
-                    ref: "/test/test_owner/other201/path",
+                    ref: "/apps/test/test_owner/other201/path",
                     value: {
                       ".owner": {
                         "owners": {
@@ -1611,112 +1805,186 @@ describe('Blockchain Node', () => {
         }
         assert.deepEqual(body.result, [
           {
+            "tx_hash": "erased",
             "result": {
               "code": 0,
-              "gas_amount": 1,
+              "bandwidth_gas_amount": 1,
+              "gas_amount_charged": 0,
               "gas_amount_total": {
-                "app": {},
-                "service": 1
+                "bandwidth": {
+                  "service": 0,
+                  "app": {
+                    "test": 1
+                  }
+                },
+                "state": {
+                  "app": {
+                    "test": 380
+                  },
+                  "service": 0
+                }
               },
-              "gas_cost_total": 0,
-            },
-            "tx_hash": "erased"
+              "gas_cost_total": 0
+            }
           },
           {
+            "tx_hash": "erased",
             "result": {
               "code": 0,
-              "gas_amount": 1,
+              "bandwidth_gas_amount": 1,
+              "gas_amount_charged": 0,
               "gas_amount_total": {
-                "app": {},
-                "service": 1
+                "bandwidth": {
+                  "service": 0,
+                  "app": {
+                    "test": 1
+                  }
+                },
+                "state": {
+                  "app": {
+                    "test": 178
+                  },
+                  "service": 0
+                }
               },
               "gas_cost_total": 0
-            },
-            "tx_hash": "erased"
+            }
           },
           {
+            "tx_hash": "erased",
             "result": {
               "code": 0,
-              "gas_amount": 1,
+              "bandwidth_gas_amount": 1,
+              "gas_amount_charged": 0,
               "gas_amount_total": {
-                "app": {},
-                "service": 1
+                "bandwidth": {
+                  "service": 0,
+                  "app": {
+                    "test": 1
+                  }
+                },
+                "state": {
+                  "app": {
+                    "test": 178
+                  },
+                  "service": 0
+                }
               },
               "gas_cost_total": 0
-            },
-            "tx_hash": "erased"
+            }
           },
           {
+            "tx_hash": "erased",
             "result": {
               "code": 0,
-              "gas_amount": 1,
+              "bandwidth_gas_amount": 1,
+              "gas_amount_charged": 1552,
               "gas_amount_total": {
-                "app": {},
-                "service": 1
+                "bandwidth": {
+                  "service": 0,
+                  "app": {
+                    "test": 1
+                  }
+                },
+                "state": {
+                  "service": 1552
+                }
               },
               "gas_cost_total": 0
-            },
-            "tx_hash": "erased"
+            }
           },
           {
+            "tx_hash": "erased",
             "result": {
               "code": 0,
-              "gas_amount": 1,
+              "bandwidth_gas_amount": 1,
+              "gas_amount_charged": 0,
               "gas_amount_total": {
-                "app": {},
-                "service": 1
+                "bandwidth": {
+                  "service": 0,
+                  "app": {
+                    "test": 1
+                  }
+                },
+                "state": {
+                  "app": {
+                    "test": 734
+                  },
+                  "service": 0
+                }
               },
               "gas_cost_total": 0
-            },
-            "tx_hash": "erased"
+            }
           },
           {
+            "tx_hash": "erased",
             "result": {
               "code": 0,
-              "gas_amount": 1,
+              "bandwidth_gas_amount": 1,
+              "gas_amount_charged": 0,
               "gas_amount_total": {
-                "app": {},
-                "service": 1
+                "bandwidth": {
+                  "service": 0,
+                  "app": {
+                    "test": 1
+                  }
+                },
+                "state": {
+                  "app": {
+                    "test": 1600
+                  },
+                  "service": 0
+                }
               },
               "gas_cost_total": 0
-            },
-            "tx_hash": "erased"
+            }
           },
           {
+            "tx_hash": "erased",
             "result": {
-              "result_list": [
-                {
+              "result_list": {
+                "0": {
                   "code": 0,
-                  "gas_amount": 1
+                  "bandwidth_gas_amount": 1
                 },
-                {
+                "1": {
                   "code": 0,
-                  "gas_amount": 1
+                  "bandwidth_gas_amount": 1
                 },
-                {
+                "2": {
                   "code": 0,
-                  "gas_amount": 1
+                  "bandwidth_gas_amount": 1
                 },
-                {
+                "3": {
                   "code": 0,
-                  "gas_amount": 1
+                  "bandwidth_gas_amount": 1
                 },
-                {
+                "4": {
                   "code": 0,
-                  "gas_amount": 1
+                  "bandwidth_gas_amount": 1
                 },
-                {
+                "5": {
                   "code": 0,
-                  "gas_amount": 1
+                  "bandwidth_gas_amount": 1
                 }
-              ],
+              },
+              "gas_amount_charged": 1552,
               "gas_amount_total": {
-                "app": {},
-                "service": 6
+                "bandwidth": {
+                  "service": 0,
+                  "app": {
+                    "test": 6
+                  }
+                },
+                "state": {
+                  "app": {
+                    "test": 3070
+                  },
+                  "service": 1552
+                }
               },
               "gas_cost_total": 0
-            },
-            "tx_hash": "erased"
+            }
           }
         ]);
         expect(body.code).to.equal(0);
@@ -1724,11 +1992,11 @@ describe('Blockchain Node', () => {
         // Confirm that the value is set properly.
         await CommonUtil.sleep(6);
         const resultAfter = parseOrLog(syncRequest(
-            'GET', server1 + '/get_value?ref=test/test_value/some200/path')
+            'GET', server1 + '/get_value?ref=/apps/test/test_value/some200/path')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultAfter, 'some other200 value');
         const resultAfter2 = parseOrLog(syncRequest(
-            'GET', server1 + '/get_value?ref=test/test_value/some201/path')
+            'GET', server1 + '/get_value?ref=/apps/test/test_value/some201/path')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultAfter2, 'some other201 value');
       });
@@ -1738,11 +2006,11 @@ describe('Blockchain Node', () => {
             'GET', server1 + '/get_address').body.toString('utf-8')).result;
         // Check the original values.
         const resultBefore = parseOrLog(syncRequest(
-            'GET', server1 + '/get_value?ref=test/test_value/some202/path')
+            'GET', server1 + '/get_value?ref=/apps/test/test_value/some202/path')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultBefore, null);
         const resultBefore2 = parseOrLog(syncRequest(
-            'GET', server1 + '/get_value?ref=test/test_value/some203/path')
+            'GET', server1 + '/get_value?ref=/apps/test/test_value/some203/path')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultBefore2, null);
         const nonce = parseOrLog(syncRequest(
@@ -1753,7 +2021,7 @@ describe('Blockchain Node', () => {
             {
               operation: {
                 // Default type: SET_VALUE
-                ref: "test/test_value/some202/path",
+                ref: "/apps/test/test_value/some202/path",
                 value: "some other202 value",
               },
               timestamp: Date.now(),
@@ -1762,7 +2030,7 @@ describe('Blockchain Node', () => {
             {
               operation: {
                 type: 'INC_VALUE',
-                ref: "test/test_value/some202/path2",
+                ref: "/apps/test/test_value/some202/path2",
                 value: 10
               },
               timestamp: Date.now(),
@@ -1771,7 +2039,7 @@ describe('Blockchain Node', () => {
             {
               operation: {
                 type: 'DEC_VALUE',
-                ref: "test/test_value/some202/path3",
+                ref: "/apps/test/test_value/some202/path3",
                 value: 10
               },
               timestamp: Date.now(),
@@ -1780,7 +2048,7 @@ describe('Blockchain Node', () => {
             {
               operation: {
                 type: 'SET_VALUE',
-                ref: "some/wrong/path",
+                ref: "/apps/some/wrong/path",
                 value: "some other202 value",
               },
               timestamp: Date.now(),
@@ -1789,7 +2057,7 @@ describe('Blockchain Node', () => {
             {
               operation: {
                 type: 'SET_FUNCTION',
-                ref: "/test/test_function/other202/path",
+                ref: "/apps/test/test_function/other202/path",
                 value: {
                   ".function": {
                     "fid": {
@@ -1807,9 +2075,11 @@ describe('Blockchain Node', () => {
             {
               operation: {
                 type: 'SET_RULE',
-                ref: "/test/test_rule/other202/path",
+                ref: "/apps/test/test_rule/other202/path",
                 value: {
-                  ".write": "some other202 rule config"
+                  ".rule": {
+                    "write": "some other202 rule config"
+                  }
                 }
               },
               timestamp: Date.now(),
@@ -1818,7 +2088,7 @@ describe('Blockchain Node', () => {
             {
               operation: {
                 type: 'SET_OWNER',
-                ref: "/test/test_owner/other202/path",
+                ref: "/apps/test/test_owner/other202/path",
                 value: {
                   ".owner": {
                     "owners": {
@@ -1841,22 +2111,22 @@ describe('Blockchain Node', () => {
                 op_list: [
                   {
                     type: "SET_VALUE",
-                    ref: "test/test_value/some203/path",
+                    ref: "/apps/test/test_value/some203/path",
                     value: "some other203 value",
                   },
                   {
                     type: 'INC_VALUE',
-                    ref: "test/test_value/some203/path2",
+                    ref: "/apps/test/test_value/some203/path2",
                     value: 5
                   },
                   {
                     type: 'DEC_VALUE',
-                    ref: "test/test_value/some203/path3",
+                    ref: "/apps/test/test_value/some203/path3",
                     value: 5
                   },
                   {
                     type: 'SET_FUNCTION',
-                    ref: "/test/test_function/other203/path",
+                    ref: "/apps/test/test_function/other203/path",
                     value: {
                       ".function": {
                         "fid": {
@@ -1870,14 +2140,16 @@ describe('Blockchain Node', () => {
                   },
                   {
                     type: 'SET_RULE',
-                    ref: "/test/test_rule/other203/path",
+                    ref: "/apps/test/test_rule/other203/path",
                     value: {
-                      ".write": "some other203 rule config"
+                      ".rule": {
+                        "write": "some other203 rule config"
+                      }
                     }
                   },
                   {
                     type: 'SET_OWNER',
-                    ref: "/test/test_owner/other203/path",
+                    ref: "/apps/test/test_owner/other203/path",
                     value: {
                       ".owner": {
                         "owners": {
@@ -1908,125 +2180,207 @@ describe('Blockchain Node', () => {
         }
         assert.deepEqual(body.result, [
           {
+            "tx_hash": "erased",
             "result": {
               "code": 0,
-              "gas_amount": 1,
+              "bandwidth_gas_amount": 1,
+              "gas_amount_charged": 0,
               "gas_amount_total": {
-                "app": {},
-                "service": 1
+                "bandwidth": {
+                  "service": 0,
+                  "app": {
+                    "test": 1
+                  }
+                },
+                "state": {
+                  "app": {
+                    "test": 380
+                  },
+                  "service": 0
+                }
               },
               "gas_cost_total": 0
-            },
-            "tx_hash": "erased"
+            }
           },
           {
+            "tx_hash": "erased",
             "result": {
               "code": 0,
-              "gas_amount": 1,
+              "bandwidth_gas_amount": 1,
+              "gas_amount_charged": 0,
               "gas_amount_total": {
-                "app": {},
-                "service": 1
+                "bandwidth": {
+                  "service": 0,
+                  "app": {
+                    "test": 1
+                  }
+                },
+                "state": {
+                  "app": {
+                    "test": 178
+                  },
+                  "service": 0
+                }
               },
               "gas_cost_total": 0
-            },
-            "tx_hash": "erased"
+            }
           },
           {
+            "tx_hash": "erased",
             "result": {
               "code": 0,
-              "gas_amount": 1,
+              "bandwidth_gas_amount": 1,
+              "gas_amount_charged": 0,
               "gas_amount_total": {
-                "app": {},
-                "service": 1
+                "bandwidth": {
+                  "service": 0,
+                  "app": {
+                    "test": 1
+                  }
+                },
+                "state": {
+                  "app": {
+                    "test": 178
+                  },
+                  "service": 0
+                }
               },
               "gas_cost_total": 0
-            },
-            "tx_hash": "erased"
+            }
           },
           {
+            "tx_hash": "erased",
             "result": {
+              "error_message": "No write permission on: /apps/some/wrong/path",
               "code": 103,
-              "error_message": "No .write permission on: some/wrong/path",
-              "gas_amount": 0,
+              "bandwidth_gas_amount": 1,
+              "gas_amount_charged": 0,
               "gas_amount_total": {
-                "app": {},
-                "service": 0
+                "bandwidth": {
+                  "app": {
+                    "some": 1
+                  },
+                  "service": 0,
+                },
+                "state": {
+                  "service": 0
+                }
               },
               "gas_cost_total": 0
-            },
-            "tx_hash": "erased"
+            }
           },
           {
+            "tx_hash": "erased",
             "result": {
               "code": 0,
-              "gas_amount": 1,
+              "bandwidth_gas_amount": 1,
+              "gas_amount_charged": 1552,
               "gas_amount_total": {
-                "app": {},
-                "service": 1
+                "bandwidth": {
+                  "service": 0,
+                  "app": {
+                    "test": 1
+                  }
+                },
+                "state": {
+                  "service": 1552
+                }
               },
               "gas_cost_total": 0
-            },
-            "tx_hash": "erased"
+            }
           },
           {
+            "tx_hash": "erased",
             "result": {
               "code": 0,
-              "gas_amount": 1,
+              "bandwidth_gas_amount": 1,
+              "gas_amount_charged": 0,
               "gas_amount_total": {
-                "app": {},
-                "service": 1
+                "bandwidth": {
+                  "service": 0,
+                  "app": {
+                    "test": 1
+                  }
+                },
+                "state": {
+                  "app": {
+                    "test": 734
+                  },
+                  "service": 0
+                }
               },
               "gas_cost_total": 0
-            },
-            "tx_hash": "erased"
+            }
           },
           {
+            "tx_hash": "erased",
             "result": {
               "code": 0,
-              "gas_amount": 1,
+              "bandwidth_gas_amount": 1,
+              "gas_amount_charged": 0,
               "gas_amount_total": {
-                "app": {},
-                "service": 1
+                "bandwidth": {
+                  "service": 0,
+                  "app": {
+                    "test": 1
+                  }
+                },
+                "state": {
+                  "app": {
+                    "test": 1600
+                  },
+                  "service": 0
+                }
               },
               "gas_cost_total": 0
-            },
-            "tx_hash": "erased"
+            }
           },
           {
+            "tx_hash": "erased",
             "result": {
-              "result_list": [
-                {
+              "result_list": {
+                "0": {
                   "code": 0,
-                  "gas_amount": 1
+                  "bandwidth_gas_amount": 1
                 },
-                {
+                "1": {
                   "code": 0,
-                  "gas_amount": 1
+                  "bandwidth_gas_amount": 1
                 },
-                {
+                "2": {
                   "code": 0,
-                  "gas_amount": 1
+                  "bandwidth_gas_amount": 1
                 },
-                {
+                "3": {
                   "code": 0,
-                  "gas_amount": 1
+                  "bandwidth_gas_amount": 1
                 },
-                {
+                "4": {
                   "code": 0,
-                  "gas_amount": 1
+                  "bandwidth_gas_amount": 1
                 },
-                {
+                "5": {
                   "code": 0,
-                  "gas_amount": 1
+                  "bandwidth_gas_amount": 1
                 }
-              ],
+              },
+              "gas_amount_charged": 1552,
               "gas_amount_total": {
-                "app": {},
-                "service": 6
+                "bandwidth": {
+                  "service": 0,
+                  "app": {
+                    "test": 6
+                  }
+                },
+                "state": {
+                  "app": {
+                    "test": 3070
+                  },
+                  "service": 1552
+                }
               },
-              "gas_cost_total": 0,
-            },
-            "tx_hash": "erased"
+              "gas_cost_total": 0
+            }
           }
         ]);
         expect(body.code).to.equal(0);
@@ -2034,11 +2388,11 @@ describe('Blockchain Node', () => {
         // Confirm that the value is set properly.
         await CommonUtil.sleep(6);
         const resultAfter = parseOrLog(syncRequest(
-            'GET', server1 + '/get_value?ref=test/test_value/some202/path')
+            'GET', server1 + '/get_value?ref=/apps/test/test_value/some202/path')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultAfter, 'some other202 value');
         const resultAfter2 = parseOrLog(syncRequest(
-            'GET', server1 + '/get_value?ref=test/test_value/some203/path')
+            'GET', server1 + '/get_value?ref=/apps/test/test_value/some203/path')
             .body.toString('utf-8')).result;
         assert.deepEqual(resultAfter2, 'some other203 value');
       })
@@ -2051,22 +2405,63 @@ describe('Blockchain Node', () => {
         public_key: "eb8c8577e8be18a83829c5c8a2ec2a754ef0a190e5a01139e9a24aae8f56842dfaf708da56d0f395bbfef08633237398dec96343f62ce217130d9738a76adfdf"
       };
 
-      it('accepts a transaction with nonce unordered (-1)', () => {
-        const client = jayson.client.http(server1 + '/json-rpc');
-        const txBody = {
-          operation: {
-            type: 'SET_VALUE',
-            value: 'some other value',
-            ref: `test/test_value/some/path`
-          },
-          timestamp: Date.now(),
-          nonce: -1
+      before(async () => {
+        const currentRule = parseOrLog(syncRequest('GET', server1 + '/get_rule?ref=/apps/test')
+          .body.toString('utf-8')).result[".rule"]["write"];
+        const newOwners = parseOrLog(syncRequest('GET', server1 + '/get_owner?ref=/apps/test')
+          .body.toString('utf-8')).result[".owner"];
+        const newRule = `${currentRule} || auth.addr === '${account.address}'`;
+        newOwners["owners"][account.address] = {
+          "branch_owner": true,
+          "write_owner": true,
+          "write_rule": true,
+          "write_function": true
         };
-        const signature =
-            ainUtil.ecSignTransaction(txBody, Buffer.from(account.private_key, 'hex'));
-        return client.request('ain_sendSignedTransaction', {
-          tx_body: txBody,
-          signature,
+        const res = parseOrLog(syncRequest('POST', server1 + '/set', {json: {
+            op_list: [
+              {
+                type: 'SET_RULE',
+                ref: '/apps/test',
+                value: {
+                  ".rule": {
+                    "write": newRule
+                  }
+                }
+              },
+              {
+                type: 'SET_OWNER',
+                ref: '/apps/test',
+                value: {
+                  ".owner": newOwners
+                }
+              }
+            ],
+            timestamp: Date.now(),
+            nonce: -1
+          }})
+          .body.toString('utf-8')).result;
+        assert.deepEqual(CommonUtil.isFailedTx(_.get(res, 'result')), false);
+        if (!(await waitUntilTxFinalized(serverList, _.get(res, 'tx_hash')))) {
+          console.error(`Failed to check finalization of tx.`);
+        }
+      })
+
+      it('accepts a transaction with nonce unordered (-1)', () => {
+        const client = jayson.client.http(server1 + '/json-rpc');
+        const txBody = {
+          operation: {
+            type: 'SET_VALUE',
+            value: 'some other value',
+            ref: `/apps/test/test_value/some/path`
+          },
+          timestamp: Date.now(),
+          nonce: -1
+        };
+        const signature =
+            ainUtil.ecSignTransaction(txBody, Buffer.from(account.private_key, 'hex'));
+        return client.request('ain_sendSignedTransaction', {
+          tx_body: txBody,
+          signature,
           protoVer: CURRENT_PROTOCOL_VERSION
         }).then((res) => {
           const result = _.get(res, 'result.result', null);
@@ -2076,10 +2471,21 @@ describe('Blockchain Node', () => {
             result: {
               result: {
                 code: 0,
-                gas_amount: 1,
+                bandwidth_gas_amount: 1,
+                gas_amount_charged: 0,
                 gas_amount_total: {
-                  service: 1,
-                  app: {}
+                  bandwidth: {
+                    app: {
+                      test: 1
+                    },
+                    service: 0
+                  },
+                  state: {
+                    app: {
+                      test: 24
+                    },
+                    service: 0
+                  }
                 },
                 gas_cost_total: 0
               },
@@ -2102,7 +2508,7 @@ describe('Blockchain Node', () => {
             operation: {
               type: 'SET_VALUE',
               value: 'some other value 2',
-              ref: `test/test_value/some/path`
+              ref: `/apps/test/test_value/some/path`
             },
             timestamp: Date.now(),
             nonce,  // numbered nonce
@@ -2122,10 +2528,21 @@ describe('Blockchain Node', () => {
               result: {
                 result: {
                   code: 0,
-                  gas_amount: 1,
+                  bandwidth_gas_amount: 1,
+                  gas_amount_charged: 0,
                   gas_amount_total: {
-                    service: 1,
-                    app: {}
+                    bandwidth: {
+                      app: {
+                        test: 1
+                      },
+                      service: 0
+                    },
+                    state: {
+                      app: {
+                        test: 28
+                      },
+                      service: 0
+                    }
                   },
                   gas_cost_total: 0,
                 },
@@ -2143,7 +2560,7 @@ describe('Blockchain Node', () => {
           operation: {
             type: 'SET_VALUE',
             value: longText,
-            ref: `test/test_long_text`
+            ref: `/apps/test/test_long_text`
           },
           timestamp: Date.now(),
           nonce: -1
@@ -2171,7 +2588,7 @@ describe('Blockchain Node', () => {
           operation: {
             type: 'SET_VALUE',
             value: 'some other value',
-            ref: `test/test_value/some/path`
+            ref: `/apps/test/test_value/some/path`
           },
           timestamp: Date.now(),
           nonce: -1
@@ -2199,7 +2616,7 @@ describe('Blockchain Node', () => {
           operation: {
             type: 'SET_VALUE',
             value: 'some other value',
-            ref: `test/test_value/some/path`
+            ref: `/apps/test/test_value/some/path`
           },
           timestamp: Date.now(),
           // missing nonce
@@ -2238,7 +2655,7 @@ describe('Blockchain Node', () => {
         txBodyBefore = {
           operation: {
             // Default type: SET_VALUE
-            ref: "test/test_value/some400/path",
+            ref: "/apps/test/test_value/some400/path",
             value: "some other300 value",
           },
           timestamp: Date.now(),
@@ -2250,7 +2667,7 @@ describe('Blockchain Node', () => {
         txBodyAfter = {
           operation: {
             type: 'INC_VALUE',
-            ref: "test/test_value/some400/path2",
+            ref: "/apps/test/test_value/some400/path2",
             value: 10
           },
           timestamp: Date.now(),
@@ -2266,7 +2683,7 @@ describe('Blockchain Node', () => {
           {
             operation: {
               // Default type: SET_VALUE
-              ref: "test/test_value/some300/path",
+              ref: "/apps/test/test_value/some300/path",
               value: "some other300 value",
             },
             timestamp: Date.now(),
@@ -2275,7 +2692,7 @@ describe('Blockchain Node', () => {
           {
             operation: {
               type: 'INC_VALUE',
-              ref: "test/test_value/some300/path2",
+              ref: "/apps/test/test_value/some300/path2",
               value: 10
             },
             timestamp: Date.now(),
@@ -2284,7 +2701,7 @@ describe('Blockchain Node', () => {
           {
             operation: {
               type: 'DEC_VALUE',
-              ref: "test/test_value/some300/path3",
+              ref: "/apps/test/test_value/some300/path3",
               value: 10
             },
             timestamp: Date.now(),
@@ -2293,7 +2710,7 @@ describe('Blockchain Node', () => {
           {
             operation: {
               type: 'SET_FUNCTION',
-              ref: "/test/test_function/other300/path",
+              ref: "/apps/test/test_function/other300/path",
               value: {
                 ".function": {
                   "fid": {
@@ -2311,9 +2728,11 @@ describe('Blockchain Node', () => {
           {
             operation: {
               type: 'SET_RULE',
-              ref: "/test/test_rule/other300/path",
+              ref: "/apps/test/test_rule/other300/path",
               value: {
-                ".write": "some other300 rule config"
+                ".rule": {
+                  "write": "some other300 rule config"
+                }
               }
             },
             timestamp: Date.now(),
@@ -2322,7 +2741,7 @@ describe('Blockchain Node', () => {
           {
             operation: {
               type: 'SET_OWNER',
-              ref: "/test/test_owner/other300/path",
+              ref: "/apps/test/test_owner/other300/path",
               value: {
                 ".owner": {
                   "owners": {
@@ -2345,22 +2764,22 @@ describe('Blockchain Node', () => {
               op_list: [
                 {
                   type: "SET_VALUE",
-                  ref: "test/test_value/some301/path",
+                  ref: "/apps/test/test_value/some301/path",
                   value: "some other301 value",
                 },
                 {
                   type: 'INC_VALUE',
-                  ref: "test/test_value/some301/path2",
+                  ref: "/apps/test/test_value/some301/path2",
                   value: 5
                 },
                 {
                   type: 'DEC_VALUE',
-                  ref: "test/test_value/some301/path3",
+                  ref: "/apps/test/test_value/some301/path3",
                   value: 5
                 },
                 {
                   type: 'SET_FUNCTION',
-                  ref: "/test/test_function/other301/path",
+                  ref: "/apps/test/test_function/other301/path",
                   value: {
                     ".function": {
                       "fid": {
@@ -2374,14 +2793,16 @@ describe('Blockchain Node', () => {
                 },
                 {
                   type: 'SET_RULE',
-                  ref: "/test/test_rule/other301/path",
+                  ref: "/apps/test/test_rule/other301/path",
                   value: {
-                    ".write": "some other301 rule config"
+                    ".rule": {
+                      "write": "some other301 rule config"
+                    }
                   }
                 },
                 {
                   type: 'SET_OWNER',
-                  ref: "/test/test_owner/other301/path",
+                  ref: "/apps/test/test_owner/other301/path",
                   value: {
                     ".owner": {
                       "owners": {
@@ -2417,7 +2838,7 @@ describe('Blockchain Node', () => {
           const resultList = _.get(res, 'result.result', null);
           expect(CommonUtil.isArray(resultList)).to.equal(true);
           for (let i = 0; i < resultList.length; i++) {
-            expect(CommonUtil.isFailedTx(resultList[i].result)).to.equal(false);
+            expect(CommonUtil.txPrecheckFailed(resultList[i].result)).to.equal(false);
           }
         })
       })
@@ -2428,7 +2849,7 @@ describe('Blockchain Node', () => {
           operation: {
             type: 'SET_VALUE',
             value: 'some other value',
-            ref: `test/test_value/some/path`
+            ref: `/apps/test/test_value/some/path`
           },
           timestamp: Date.now(),
           nonce: -1
@@ -2459,7 +2880,7 @@ describe('Blockchain Node', () => {
           operation: {
             type: 'SET_VALUE',
             value: 'some other value',
-            ref: `test/test_value/some/path`
+            ref: `/apps/test/test_value/some/path`
           },
           nonce: -1
         };
@@ -2494,7 +2915,7 @@ describe('Blockchain Node', () => {
           operation: {
             type: 'SET_VALUE',
             value: 'some other value',
-            ref: `test/test_value/some/path`
+            ref: `/apps/test/test_value/some/path`
           },
           nonce: -1
         };
@@ -2533,7 +2954,7 @@ describe('Blockchain Node', () => {
           operation: {
             type: 'SET_VALUE',
             value: 'some other value',
-            ref: `test/test_value/some/path`
+            ref: `/apps/test/test_value/some/path`
           },
           nonce: -1
         };
@@ -2593,7 +3014,7 @@ describe('Blockchain Node', () => {
             "result": {
               "code": 4,
               "error_message": "[executeTransactionAndAddToPool] Tx pool does NOT have enough room (100) for account: 0x85a620A5A46d01cc1fCF49E73ab00710d4da943E",
-              "gas_amount": 0
+              "bandwidth_gas_amount": 0
             },
             "tx_hash": "erased"
           }
@@ -2606,7 +3027,7 @@ describe('Blockchain Node', () => {
         const txBody = {
           operation: {
             type: 'SET_VALUE',
-            ref: `test/test_long_text`,
+            ref: `/apps/test/test_long_text`,
             value: longText
           },
           timestamp: Date.now(),
@@ -2649,7 +3070,7 @@ describe('Blockchain Node', () => {
           operation: {
             type: 'SET_VALUE',
             value: 'some other value',
-            ref: `test/test_value/some/path`
+            ref: `/apps/test/test_value/some/path`
           },
           timestamp: Date.now(),
           nonce: -1
@@ -2687,7 +3108,7 @@ describe('Blockchain Node', () => {
           operation: {
             type: 'SET_VALUE',
             value: 'some other value',
-            ref: `test/test_value/some/path`
+            ref: `/apps/test/test_value/some/path`
           },
           timestamp: Date.now(),
           // missing nonce
@@ -2724,14 +3145,14 @@ describe('Blockchain Node', () => {
   })
 
   describe('Function triggering', () => {
-    const setFunctionWithOwnerOnlyPath = '/test/test_function_triggering/owner_only';
-    const saveLastTxAllowedPath = '/test/test_function_triggering/allowed_path_with_fid';
-    const saveLastTxNotAllowedPath = '/test/test_function_triggering/not_allowed_path_with_fid';
-    const saveLastTxAllowedPathWithFids = '/test/test_function_triggering/allowed_path_with_fids';
-    const saveLastTxNotAllowedPathWithFids = '/test/test_function_triggering/not_allowed_path_with_fids';
-    const setOwnerConfigAllowedPath = '/test/test_function_triggering/set_owner_allowed_path_with_fid';
-    const setOwnerConfigNotAllowedPath = '/test/test_function_triggering/set_owner_not_allowed_path_with_fid';
-    const triggerRestFunctionPath = '/test/test_function_triggering/rest_function_path';
+    const setFunctionWithOwnerOnlyPath = '/apps/test/test_function_triggering/owner_only';
+    const saveLastTxAllowedPath = '/apps/test/test_function_triggering/allowed_path_with_fid';
+    const saveLastTxNotAllowedPath = '/apps/test/test_function_triggering/not_allowed_path_with_fid';
+    const saveLastTxAllowedPathWithFids = '/apps/test/test_function_triggering/allowed_path_with_fids';
+    const saveLastTxNotAllowedPathWithFids = '/apps/test/test_function_triggering/not_allowed_path_with_fids';
+    const setOwnerConfigAllowedPath = '/apps/test/test_function_triggering/set_owner_allowed_path_with_fid';
+    const setOwnerConfigNotAllowedPath = '/apps/test/test_function_triggering/set_owner_not_allowed_path_with_fid';
+    const triggerRestFunctionPath = '/apps/test/test_function_triggering/rest_function_path';
 
     let transferFrom; // = server1
     let transferTo; // = server2
@@ -2790,7 +3211,7 @@ describe('Blockchain Node', () => {
           op_list: [
             {
               type: 'SET_FUNCTION',
-              ref: '/test/test_function_triggering/allowed_path_with_fid/value',
+              ref: '/apps/test/test_function_triggering/allowed_path_with_fid/value',
               value: {
                 ".function": {
                   "_saveLastTx": {
@@ -2802,21 +3223,25 @@ describe('Blockchain Node', () => {
             },
             {
               type: 'SET_RULE',
-              ref: '/test/test_function_triggering/allowed_path_with_fid/value',
+              ref: '/apps/test/test_function_triggering/allowed_path_with_fid/value',
               value: {
-                ".write": true,
+                ".rule": {
+                  "write": true
+                }
               }
             },
             {
               type: 'SET_RULE',
-              ref: '/test/test_function_triggering/allowed_path_with_fid/.last_tx/value',
+              ref: '/apps/test/test_function_triggering/allowed_path_with_fid/.last_tx/value',
               value: {
-                ".write": "auth.fid === '_saveLastTx'",
+                ".rule": {
+                  "write": "auth.fid === '_saveLastTx'"
+                }
               }
             },
             {
               type: 'SET_FUNCTION',
-              ref: '/test/test_function_triggering/not_allowed_path_with_fid/value',
+              ref: '/apps/test/test_function_triggering/not_allowed_path_with_fid/value',
               value: {
                 ".function": {
                   "_saveLastTx": {
@@ -2828,21 +3253,25 @@ describe('Blockchain Node', () => {
             },
             {
               type: 'SET_RULE',
-              ref: '/test/test_function_triggering/not_allowed_path_with_fid/value',
+              ref: '/apps/test/test_function_triggering/not_allowed_path_with_fid/value',
               value: {
-                ".write": true,
+                ".rule": {
+                  "write": true
+                }
               }
             },
             {
               type: 'SET_RULE',
-              ref: '/test/test_function_triggering/not_allowed_path_with_fid/.last_tx/value',
+              ref: '/apps/test/test_function_triggering/not_allowed_path_with_fid/.last_tx/value',
               value: {
-                ".write": "auth.fid === 'some function id'",
+                ".rule": {
+                  "write": "auth.fid === 'some function id'"
+                }
               }
             },
             {
               type: 'SET_FUNCTION',
-              ref: '/test/test_function_triggering/allowed_path_with_fids/value',
+              ref: '/apps/test/test_function_triggering/allowed_path_with_fids/value',
               value: {
                 ".function": {
                   "_saveLastTx": {
@@ -2854,21 +3283,25 @@ describe('Blockchain Node', () => {
             },
             {
               type: 'SET_RULE',
-              ref: '/test/test_function_triggering/allowed_path_with_fids/value',
+              ref: '/apps/test/test_function_triggering/allowed_path_with_fids/value',
               value: {
-                ".write": true,
+                ".rule": {
+                  "write": true
+                }
               }
             },
             {
               type: 'SET_RULE',
-              ref: '/test/test_function_triggering/allowed_path_with_fids/.last_tx/value',
+              ref: '/apps/test/test_function_triggering/allowed_path_with_fids/.last_tx/value',
               value: {
-                ".write": "util.includes(auth.fids, '_saveLastTx')",
+                ".rule": {
+                  "write": "util.includes(auth.fids, '_saveLastTx')"
+                }
               }
             },
             {
               type: 'SET_FUNCTION',
-              ref: '/test/test_function_triggering/not_allowed_path_with_fids/value',
+              ref: '/apps/test/test_function_triggering/not_allowed_path_with_fids/value',
               value: {
                 ".function": {
                   "_saveLastTx": {
@@ -2880,21 +3313,25 @@ describe('Blockchain Node', () => {
             },
             {
               type: 'SET_RULE',
-              ref: '/test/test_function_triggering/not_allowed_path_with_fids/value',
+              ref: '/apps/test/test_function_triggering/not_allowed_path_with_fids/value',
               value: {
-                ".write": true,
+                ".rule": {
+                  "write": true
+                }
               }
             },
             {
               type: 'SET_RULE',
-              ref: '/test/test_function_triggering/not_allowed_path_with_fids/.last_tx/value',
+              ref: '/apps/test/test_function_triggering/not_allowed_path_with_fids/.last_tx/value',
               value: {
-                ".write": "util.includes(auth.fids, 'some function id')",
+                ".rule": {
+                  "write": "util.includes(auth.fids, 'some function id')"
+                }
               }
             },
             {
               type: 'SET_FUNCTION',
-              ref: '/test/test_function_triggering/set_owner_allowed_path_with_fid/value',
+              ref: '/apps/test/test_function_triggering/set_owner_allowed_path_with_fid/value',
               value: {
                 ".function": {
                   "_setOwnerConfig": {
@@ -2906,7 +3343,7 @@ describe('Blockchain Node', () => {
             },
             {
               type: 'SET_OWNER',
-              ref: '/test/test_function_triggering/set_owner_allowed_path_with_fid',
+              ref: '/apps/test/test_function_triggering/set_owner_allowed_path_with_fid',
               value: {
                 ".owner": {
                   "owners": {
@@ -2928,7 +3365,7 @@ describe('Blockchain Node', () => {
             },
             {
               type: 'SET_FUNCTION',
-              ref: '/test/test_function_triggering/set_owner_not_allowed_path_with_fid/value',
+              ref: '/apps/test/test_function_triggering/set_owner_not_allowed_path_with_fid/value',
               value: {
                 ".function": {
                   "_setOwnerConfig": {
@@ -2940,7 +3377,7 @@ describe('Blockchain Node', () => {
             },
             {
               type: 'SET_OWNER',
-              ref: '/test/test_function_triggering/set_owner_not_allowed_path_with_fid',
+              ref: '/apps/test/test_function_triggering/set_owner_not_allowed_path_with_fid',
               value: {
                 ".owner": {
                   "owners": {
@@ -2962,7 +3399,7 @@ describe('Blockchain Node', () => {
             },
             {
               type: 'SET_FUNCTION',
-              ref: '/test/test_function_triggering/rest_function_path',
+              ref: '/apps/test/test_function_triggering/rest_function_path',
               value: {
                 ".function": {
                   "0x11111": {
@@ -2976,9 +3413,11 @@ describe('Blockchain Node', () => {
             },
             {
               type: 'SET_RULE',
-              ref: '/test/test_function_triggering/rest_function_path',
+              ref: '/apps/test/test_function_triggering/rest_function_path',
               value: {
-                ".write": true,
+                ".rule": {
+                  "write": true
+                }
               }
             },
           ],
@@ -2997,72 +3436,72 @@ describe('Blockchain Node', () => {
           op_list: [
             {
               type: 'SET_FUNCTION',
-              ref: '/test/test_function_triggering/allowed_path_with_fid/value',
+              ref: '/apps/test/test_function_triggering/allowed_path_with_fid/value',
               value: null
             },
             {
               type: 'SET_RULE',
-              ref: '/test/test_function_triggering/allowed_path_with_fid/value',
+              ref: '/apps/test/test_function_triggering/allowed_path_with_fid/value',
               value: null
             },
             {
               type: 'SET_FUNCTION',
-              ref: '/test/test_function_triggering/not_allowed_path_with_fid/value',
+              ref: '/apps/test/test_function_triggering/not_allowed_path_with_fid/value',
               value: null
             },
             {
               type: 'SET_RULE',
-              ref: '/test/test_function_triggering/not_allowed_path_with_fid/value',
+              ref: '/apps/test/test_function_triggering/not_allowed_path_with_fid/value',
               value: null
             },
             {
               type: 'SET_FUNCTION',
-              ref: '/test/test_function_triggering/allowed_path_with_fids/value',
+              ref: '/apps/test/test_function_triggering/allowed_path_with_fids/value',
               value: null
             },
             {
               type: 'SET_RULE',
-              ref: '/test/test_function_triggering/allowed_path_with_fids/value',
+              ref: '/apps/test/test_function_triggering/allowed_path_with_fids/value',
               value: null
             },
             {
               type: 'SET_FUNCTION',
-              ref: '/test/test_function_triggering/not_allowed_path_with_fids/value',
+              ref: '/apps/test/test_function_triggering/not_allowed_path_with_fids/value',
               value: null
             },
             {
               type: 'SET_RULE',
-              ref: '/test/test_function_triggering/not_allowed_path_with_fids/value',
+              ref: '/apps/test/test_function_triggering/not_allowed_path_with_fids/value',
               value: null
             },
             {
               type: 'SET_FUNCTION',
-              ref: '/test/test_function_triggering/set_owner_allowed_path_with_fid/value',
+              ref: '/apps/test/test_function_triggering/set_owner_allowed_path_with_fid/value',
               value: null
             },
             {
               type: 'SET_OWNER',
-              ref: '/test/test_function_triggering/set_owner_allowed_path_with_fid',
+              ref: '/apps/test/test_function_triggering/set_owner_allowed_path_with_fid',
               value: null
             },
             {
               type: 'SET_FUNCTION',
-              ref: '/test/test_function_triggering/set_owner_not_allowed_path_with_fid/value',
+              ref: '/apps/test/test_function_triggering/set_owner_not_allowed_path_with_fid/value',
               value: null
             },
             {
               type: 'SET_OWNER',
-              ref: '/test/test_function_triggering/set_owner_not_allowed_path_with_fid',
+              ref: '/apps/test/test_function_triggering/set_owner_not_allowed_path_with_fid',
               value: null
             },
             {
               type: 'SET_FUNCTION',
-              ref: '/test/test_function_triggering/rest_function_path',
+              ref: '/apps/test/test_function_triggering/rest_function_path',
               value: null,
             },
             {
               type: 'SET_RULE',
-              ref: '/test/test_function_triggering/rest_function_path',
+              ref: '/apps/test/test_function_triggering/rest_function_path',
               value: null,
             },
           ],
@@ -3118,7 +3557,7 @@ describe('Blockchain Node', () => {
           expect(resp).to.not.equal(null);
         });
 
-        it('owner only: set_function with ownerOnly = true (_transfer)', () => {
+        it('owner only: set_function with ownerOnly = true (_transfer)', async () => {
           const body = parseOrLog(syncRequest('POST', server2 + '/set_function', {json: {
             ref: setFunctionWithOwnerOnlyPath,
             value: {
@@ -3135,13 +3574,24 @@ describe('Blockchain Node', () => {
           assert.deepEqual(_.get(body, 'result.result'), {
             "code": 403,
             "error_message": "Trying to write owner-only function: _transfer",
-            "gas_amount": 0,
+            "bandwidth_gas_amount": 1,
+            "gas_amount_charged": 0,
             "gas_amount_total": {
-              "service": 0,
-              "app": {}
+              "bandwidth": {
+                "app": {
+                  "test": 1
+                },
+                "service": 0
+              },
+              "state": {
+                "service": 0
+              }
             },
             "gas_cost_total": 0,
           })
+          if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+            console.error(`Failed to check finalization of tx.`);
+          }
           const resp = parseOrLog(syncRequest('GET',
               server2 + `/get_function?ref=${setFunctionWithOwnerOnlyPath}`)
             .body.toString('utf-8')).result
@@ -3151,7 +3601,7 @@ describe('Blockchain Node', () => {
       });
 
       describe('Write rule: auth.fid', () => {
-        it('write rule: auth.fid: without function permission', () => {
+        it('write rule: auth.fid: without function permission', async () => {
           const body = parseOrLog(syncRequest('POST', server2 + '/set_value', {json: {
             ref: saveLastTxNotAllowedPath + '/value',
             value: 'some value',
@@ -3163,27 +3613,38 @@ describe('Blockchain Node', () => {
             "func_results": {
               "_saveLastTx": {
                 "code": "FAILURE",
-                "gas_amount": 0,
-                "op_results": [
-                  {
-                    "path": "/test/test_function_triggering/not_allowed_path_with_fid/.last_tx/value",
+                "bandwidth_gas_amount": 0,
+                "op_results": {
+                  "0": {
+                    "path": "/apps/test/test_function_triggering/not_allowed_path_with_fid/.last_tx/value",
                     "result": {
                       "code": 103,
-                      "error_message": "No .write permission on: /test/test_function_triggering/not_allowed_path_with_fid/.last_tx/value",
-                      "gas_amount": 0,
+                      "error_message": "No write permission on: /apps/test/test_function_triggering/not_allowed_path_with_fid/.last_tx/value",
+                      "bandwidth_gas_amount": 1,
                     }
                   }
-                ]
+                }
               }
             },
-            "gas_amount": 1,
+            "bandwidth_gas_amount": 1,
+            "gas_amount_charged": 0,
             "gas_amount_total": {
-              "app": {},
-              "service": 1
+              "bandwidth": {
+                "app": {
+                  "test": 2
+                },
+                "service": 0
+              },
+              "state": {
+                "service": 0
+              }
             },
             "gas_cost_total": 0,
           });
           assert.deepEqual(body.code, 1);
+          if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+            console.error(`Failed to check finalization of tx.`);
+          }
           const lastTx = parseOrLog(syncRequest('GET',
               server2 + `/get_value?ref=${saveLastTxNotAllowedPath + '/.last_tx/value'}`)
             .body.toString('utf-8')).result
@@ -3198,34 +3659,45 @@ describe('Blockchain Node', () => {
             timestamp: Date.now(),
             nonce: -1,
           }}).body.toString('utf-8'));
+          if (!(await waitUntilTxFinalized([server2], _.get(body, 'result.tx_hash')))) {
+            console.error(`Failed to check finalization of tx.`);
+          }
           assert.deepEqual(_.get(body, 'result.result'), {
             "code": 0,
             "func_results": {
               "_saveLastTx": {
                 "code": "SUCCESS",
-                "gas_amount": 0,
-                "op_results": [
-                  {
-                    "path": "/test/test_function_triggering/allowed_path_with_fid/.last_tx/value",
+                "bandwidth_gas_amount": 0,
+                "op_results": {
+                  "0": {
+                    "path": "/apps/test/test_function_triggering/allowed_path_with_fid/.last_tx/value",
                     "result": {
                       "code": 0,
-                      "gas_amount": 1,
+                      "bandwidth_gas_amount": 1,
                     }
                   }
-                ]
+                }
               }
             },
-            "gas_amount": 1,
+            "bandwidth_gas_amount": 1,
+            "gas_amount_charged": 0,
             "gas_amount_total": {
-              "app": {},
-              "service": 2
+              "bandwidth": {
+                "app": {
+                  "test": 2
+                },
+                "service": 0
+              },
+              "state": {
+                "app": {
+                  "test": 1252
+                },
+                "service": 0
+              }
             },
             "gas_cost_total": 0,
           });
           assert.deepEqual(body.code, 0);
-          if (!(await waitUntilTxFinalized([server2], _.get(body, 'result.tx_hash')))) {
-            console.error(`Failed to check finalization of tx.`);
-          }
           const lastTx = parseOrLog(syncRequest('GET',
               server2 + `/get_value?ref=${saveLastTxAllowedPath + '/.last_tx/value'}`)
             .body.toString('utf-8')).result
@@ -3235,7 +3707,7 @@ describe('Blockchain Node', () => {
       });
 
       describe('Write rule: auth.fids', () => {
-        it('write rule: auth.fids: without function permission', () => {
+        it('write rule: auth.fids: without function permission', async () => {
           const body = parseOrLog(syncRequest('POST', server2 + '/set_value', {json: {
             ref: saveLastTxNotAllowedPathWithFids + '/value',
             value: 'some value',
@@ -3247,27 +3719,38 @@ describe('Blockchain Node', () => {
             "func_results": {
               "_saveLastTx": {
                 "code": "FAILURE",
-                "gas_amount": 0,
-                "op_results": [
-                  {
-                    "path": "/test/test_function_triggering/not_allowed_path_with_fids/.last_tx/value",
+                "bandwidth_gas_amount": 0,
+                "op_results": {
+                  "0": {
+                    "path": "/apps/test/test_function_triggering/not_allowed_path_with_fids/.last_tx/value",
                     "result": {
                       "code": 103,
-                      "error_message": "No .write permission on: /test/test_function_triggering/not_allowed_path_with_fids/.last_tx/value",
-                      "gas_amount": 0,
+                      "error_message": "No write permission on: /apps/test/test_function_triggering/not_allowed_path_with_fids/.last_tx/value",
+                      "bandwidth_gas_amount": 1,
                     }
                   }
-                ]
+                }
               }
             },
-            "gas_amount": 1,
+            "bandwidth_gas_amount": 1,
+            "gas_amount_charged": 0,
             "gas_amount_total": {
-              "app": {},
-              "service": 1
+              "bandwidth": {
+                "app": {
+                  "test": 2
+                },
+                "service": 0
+              },
+              "state": {
+                "service": 0
+              }
             },
             "gas_cost_total": 0,
           });
           assert.deepEqual(body.code, 1);
+          if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+            console.error(`Failed to check finalization of tx.`);
+          }
           const lastTx = parseOrLog(syncRequest('GET',
               server2 + `/get_value?ref=${saveLastTxNotAllowedPathWithFids + '/.last_tx/value'}`)
             .body.toString('utf-8')).result
@@ -3287,22 +3770,33 @@ describe('Blockchain Node', () => {
             "func_results": {
               "_saveLastTx": {
                 "code": "SUCCESS",
-                "gas_amount": 0,
-                "op_results": [
-                  {
-                    "path": "/test/test_function_triggering/allowed_path_with_fids/.last_tx/value",
+                "bandwidth_gas_amount": 0,
+                "op_results": {
+                  "0": {
+                    "path": "/apps/test/test_function_triggering/allowed_path_with_fids/.last_tx/value",
                     "result": {
                       "code": 0,
-                      "gas_amount": 1,
+                      "bandwidth_gas_amount": 1,
                     }
                   }
-                ]
+                }
               }
             },
-            "gas_amount": 1,
+            "bandwidth_gas_amount": 1,
+            "gas_amount_charged": 0,
             "gas_amount_total": {
-              "app": {},
-              "service": 2
+              "bandwidth": {
+                "app": {
+                  "test": 2
+                },
+                "service": 0
+              },
+              "state": {
+                "app": {
+                  "test": 1046
+                },
+                "service": 0
+              }
             },
             "gas_cost_total": 0,
           });
@@ -3319,7 +3813,7 @@ describe('Blockchain Node', () => {
       });
 
       describe('Owner rule: auth.fid', () => {
-        it('owner rule: auth.fid: without function permission', () => {
+        it('owner rule: auth.fid: without function permission', async () => {
           const body = parseOrLog(syncRequest('POST', server2 + '/set_value', {json: {
             ref: setOwnerConfigNotAllowedPath + '/value',
             value: 'some value',
@@ -3331,27 +3825,38 @@ describe('Blockchain Node', () => {
             "func_results": {
               "_setOwnerConfig": {
                 "code": "FAILURE",
-                "gas_amount": 0,
-                "op_results": [
-                  {
-                    "path": "/test/test_function_triggering/set_owner_not_allowed_path_with_fid/value",
+                "bandwidth_gas_amount": 0,
+                "op_results": {
+                  "0": {
+                    "path": "/apps/test/test_function_triggering/set_owner_not_allowed_path_with_fid/value",
                     "result": {
                       "code": 603,
-                      "error_message": "No write_owner or branch_owner permission on: /test/test_function_triggering/set_owner_not_allowed_path_with_fid/value",
-                      "gas_amount": 0,
+                      "error_message": "No write_owner or branch_owner permission on: /apps/test/test_function_triggering/set_owner_not_allowed_path_with_fid/value",
+                      "bandwidth_gas_amount": 1,
                     }
                   }
-                ]
+                }
               }
             },
-            "gas_amount": 1,
+            "bandwidth_gas_amount": 1,
+            "gas_amount_charged": 0,
             "gas_amount_total": {
-              "app": {},
-              "service": 1
+              "bandwidth": {
+                "app": {
+                  "test": 2
+                },
+                "service": 0
+              },
+              "state": {
+                "service": 0
+              }
             },
             "gas_cost_total": 0,
           });
           assert.deepEqual(body.code, 1);
+          if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+            console.error(`Failed to check finalization of tx.`);
+          }
           const ownerConfig = parseOrLog(syncRequest('GET',
               server2 + `/get_owner?ref=${setOwnerConfigNotAllowedPath + '/value'}`)
             .body.toString('utf-8')).result
@@ -3371,22 +3876,33 @@ describe('Blockchain Node', () => {
             "func_results": {
               "_setOwnerConfig": {
                 "code": "SUCCESS",
-                "gas_amount": 0,
-                "op_results": [
-                  {
-                    "path": "/test/test_function_triggering/set_owner_allowed_path_with_fid/value",
+                "bandwidth_gas_amount": 0,
+                "op_results": {
+                  "0": {
+                    "path": "/apps/test/test_function_triggering/set_owner_allowed_path_with_fid/value",
                     "result": {
                       "code": 0,
-                      "gas_amount": 1,
+                      "bandwidth_gas_amount": 1,
                     }
                   }
-                ]
+                }
               }
             },
-            "gas_amount": 1,
+            "bandwidth_gas_amount": 1,
+            "gas_amount_charged": 0,
             "gas_amount_total": {
-              "app": {},
-              "service": 2
+              "bandwidth": {
+                "app": {
+                  "test": 2
+                },
+                "service": 0
+              },
+              "state": {
+                "app": {
+                  "test": 2832
+                },
+                "service": 0
+              }
             },
             "gas_cost_total": 0,
           });
@@ -3406,8 +3922,8 @@ describe('Blockchain Node', () => {
     describe('Function execution', () => {
       describe('/set_value', () => {
         it("when successful with function triggering", async () => {
-          const valuePath = '/test/test_function_triggering/allowed_path1/value';
-          const functionResultPath = '/test/test_function_triggering/allowed_path1/.last_tx/value';
+          const valuePath = '/apps/test/test_function_triggering/allowed_path1/value';
+          const functionResultPath = '/apps/test/test_function_triggering/allowed_path1/.last_tx/value';
           const value = 'some value';
           const timestamp = 1234567890000;
 
@@ -3430,14 +3946,18 @@ describe('Blockchain Node', () => {
                 type: 'SET_RULE',
                 ref: valuePath,
                 value: {
-                  ".write": true,
+                  ".rule": {
+                    "write": true
+                  }
                 }
               },
               {
                 type: 'SET_RULE',
                 ref: functionResultPath,
                 value: {
-                  ".write": true,  // Allow all.
+                  ".rule": {
+                    "write": true  // Allow all.
+                  }
                 }
               },
               {
@@ -3477,8 +3997,8 @@ describe('Blockchain Node', () => {
         });
 
         it("when failed with function triggering", async () => {
-          const valuePath = '/test/test_function_triggering/allowed_path2/value';
-          const functionResultPath = '/test/test_function_triggering/allowed_path2/.last_tx/value';
+          const valuePath = '/apps/test/test_function_triggering/allowed_path2/value';
+          const functionResultPath = '/apps/test/test_function_triggering/allowed_path2/.last_tx/value';
           const value = 'some value';
           const timestamp = 1234567890000 + 1;
           let valueBefore = null;
@@ -3503,14 +4023,18 @@ describe('Blockchain Node', () => {
                 type: 'SET_RULE',
                 ref: valuePath,
                 value: {
-                  ".write": true,
+                  ".rule": {
+                    "write": true
+                  }
                 }
               },
               {
                 type: 'SET_RULE',
                 ref: functionResultPath,
                 value: {
-                  ".write": "auth.fid !== '_eraseValue'",  // Do NOT allow writes by the last function.
+                  ".rule": {
+                    "write": "auth.fid !== '_eraseValue'"  // Do NOT allow writes by the last function.
+                  }
                 }
               },
               {
@@ -3544,6 +4068,9 @@ describe('Blockchain Node', () => {
             timestamp,
           }}).body.toString('utf-8'));
           assert.deepEqual(body.code, 1);  // Should fail.
+          if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+            console.error(`Failed to check finalization of tx.`);
+          }
           // Confirm that the value change is undone.
           valueAfter = parseOrLog(syncRequest('GET',
               server2 + `/get_value?ref=${valuePath}`).body.toString('utf-8')).result;
@@ -3553,8 +4080,8 @@ describe('Blockchain Node', () => {
 
       describe('/set', () => {
         it("when successful with function triggering", async () => {
-          const valuePath = '/test/test_function_triggering/allowed_path101/value';
-          const functionResultPath = '/test/test_function_triggering/allowed_path101/.last_tx/value';
+          const valuePath = '/apps/test/test_function_triggering/allowed_path101/value';
+          const functionResultPath = '/apps/test/test_function_triggering/allowed_path101/.last_tx/value';
           const value = 'some value';
           const timestamp = 1234567890000;
 
@@ -3577,14 +4104,18 @@ describe('Blockchain Node', () => {
                 type: 'SET_RULE',
                 ref: valuePath,
                 value: {
-                  ".write": true,
+                  ".rule": {
+                    "write": true
+                  }
                 }
               },
               {
                 type: 'SET_RULE',
                 ref: functionResultPath,
                 value: {
-                  ".write": true,  // Allow all.
+                  ".rule": {
+                    "write": true  // Allow all.
+                  }
                 }
               },
               {
@@ -3615,7 +4146,7 @@ describe('Blockchain Node', () => {
               },
               {
                 // Default type: SET_VALUE
-                ref: "test/nested/far/down101",
+                ref: "/apps/test/nested/far/down101",
                 value: {
                   "new": 12345
                 },
@@ -3635,8 +4166,8 @@ describe('Blockchain Node', () => {
         });
 
         it("when failed with function triggering", async () => {
-          const valuePath = '/test/test_function_triggering/allowed_path102/value';
-          const functionResultPath = '/test/test_function_triggering/allowed_path102/.last_tx/value';
+          const valuePath = '/apps/test/test_function_triggering/allowed_path102/value';
+          const functionResultPath = '/apps/test/test_function_triggering/allowed_path102/.last_tx/value';
           const value = 'some value';
           const timestamp = 1234567890000 + 1;
           let valueBefore = null;
@@ -3660,14 +4191,18 @@ describe('Blockchain Node', () => {
                 type: 'SET_RULE',
                 ref: valuePath,
                 value: {
-                  ".write": true,
+                  ".rule": {
+                    "write": true
+                  }
                 }
               },
               {
                 type: 'SET_RULE',
                 ref: functionResultPath,
                 value: {
-                  ".write": "auth.fid !== '_eraseValue'",  // Do NOT allow writes by the last function.
+                  ".rule": {
+                    "write": "auth.fid !== '_eraseValue'"  // Do NOT allow writes by the last function.
+                  }
                 }
               },
               {
@@ -3693,7 +4228,7 @@ describe('Blockchain Node', () => {
           valueBefore = parseOrLog(syncRequest('GET',
               server2 + `/get_value?ref=${valuePath}`).body.toString('utf-8')).result;
 
-          const body = parseOrLog(syncRequest('POST', server2 + '/set_value', {json: {
+          const body = parseOrLog(syncRequest('POST', server2 + '/set', {json: {
             op_list: [
               {
                 ref: valuePath,
@@ -3701,7 +4236,7 @@ describe('Blockchain Node', () => {
               },
               {
                 // Default type: SET_VALUE
-                ref: "test/nested/far/down102",
+                ref: "/apps/test/nested/far/down102",
                 value: {
                   "new": 12345
                 },
@@ -3712,6 +4247,9 @@ describe('Blockchain Node', () => {
             timestamp,
           }}).body.toString('utf-8'));
           assert.deepEqual(body.code, 1);  // Should fail.
+          if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+            console.error(`Failed to check finalization of tx.`);
+          }
           // Confirm that the value change is undone.
           valueAfter = parseOrLog(syncRequest('GET',
               server2 + `/get_value?ref=${valuePath}`).body.toString('utf-8')).result;
@@ -3723,7 +4261,7 @@ describe('Blockchain Node', () => {
     describe('App creation', () => {
       before(async () => {
         const appStakingPath =
-            `/staking/test_service_create_app/${serviceAdmin}/0/stake/${Date.now()}/value`;
+            `/staking/test_service_create_app0/${serviceAdmin}/0/stake/${Date.now()}/value`;
         const appStakingRes = parseOrLog(syncRequest('POST', server1 + '/set_value', {json: {
           ref: appStakingPath,
           value: 1
@@ -3749,50 +4287,59 @@ describe('Blockchain Node', () => {
             "func_results": {
               "_createApp": {
                 "code": "SUCCESS",
-                "gas_amount": 0,
-                "op_results": [
-                  {
+                "bandwidth_gas_amount": 0,
+                "op_results": {
+                  "0": {
                     "path": "/apps/test_service_create_app0",
                     "result": {
                       "code": 0,
-                      "gas_amount": 1
+                      "bandwidth_gas_amount": 1
                     }
                   },
-                  {
+                  "1": {
                     "path": "/apps/test_service_create_app0",
                     "result": {
                       "code": 0,
-                      "gas_amount": 1
+                      "bandwidth_gas_amount": 1
                     }
                   },
-                  {
+                  "2": {
                     "path": "/manage_app/test_service_create_app0/config",
                     "result": {
                       "code": 0,
-                      "gas_amount": 1
+                      "bandwidth_gas_amount": 1
                     }
                   },
-                  {
+                  "3": {
                     "path": "/manage_app/test_service_create_app0/create/1/result",
                     "result": {
                       "code": 0,
-                      "gas_amount": 1
+                      "bandwidth_gas_amount": 1
                     }
                   }
-                ]
+                }
               }
             },
-            "gas_amount": 1,
+            "bandwidth_gas_amount": 1,
+            "gas_amount_charged": 2399,
             "gas_amount_total": {
-              "app": {
-                "test_service_create_app0": 2
+              "bandwidth": {
+                "app": {
+                  "test_service_create_app0": 2
+                },
+                "service": 3
               },
-              "service": 3
+              "state": {
+                "service": 2396
+              }
             },
             "gas_cost_total": 0
           },
           "tx_hash": "0x4e2a4bc009347bbaa1a14f1ddecb0f2b06d02d46326d33def7c346c613093079"
         });
+        if (!(await waitUntilTxFinalized(serverList, _.get(createAppRes, 'tx_hash')))) {
+          console.error(`Failed to check finalization of tx.`);
+        }
       });
 
       it("when failed with invalid app name", async () => {
@@ -3811,34 +4358,40 @@ describe('Blockchain Node', () => {
             "func_results": {
               "_createApp": {
                 "code": "INVALID_SERVICE_NAME",
-                "gas_amount": 0,
-                "op_results": [
-                  {
+                "bandwidth_gas_amount": 0,
+                "op_results": {
+                  "0": {
                     "path": "/manage_app/0test_service_create_app/create/1/result",
                     "result": {
                       "code": 0,
-                      "gas_amount": 1
+                      "bandwidth_gas_amount": 1
                     }
                   }
-                ]
+                }
               }
             },
-            "gas_amount": 1,
+            "bandwidth_gas_amount": 1,
+            "gas_amount_charged": 2,
             "gas_amount_total": {
-              "app": {},
-              "service": 2
+              "bandwidth": {
+                "service": 2
+              },
+              "state": {
+                "service": 0
+              }
             },
             "gas_cost_total": 0
           },
           "tx_hash": "0x60f6a71fedc8bbe457680ff6cf2e24b5c2097718f226c4f40fb4f9849d52f7fa"
         });
+        if (!(await waitUntilTxFinalized(serverList, _.get(createAppRes, 'tx_hash')))) {
+          console.error(`Failed to check finalization of tx.`);
+        }
       });
-    });
 
-    describe('Gas fee', () => {
-      before(async () => {
+      it('create a public app', async () => {
         const appStakingPath =
-            `/staking/test_service_gas_fee/${serviceAdmin}/0/stake/${Date.now()}/value`;
+            `/staking/test_service_create_app1/${serviceAdmin}/0/stake/${Date.now()}/value`;
         const appStakingRes = parseOrLog(syncRequest('POST', server1 + '/set_value', {json: {
           ref: appStakingPath,
           value: 1
@@ -3846,19 +4399,120 @@ describe('Blockchain Node', () => {
         if (!(await waitUntilTxFinalized(serverList, appStakingRes.tx_hash))) {
           console.error(`Failed to check finalization of tx.`);
         }
-        const manageAppPath = '/manage_app/test_service_gas_fee/create/1';
+        const manageAppPath = '/manage_app/test_service_create_app1/create/0';
         const createAppRes = parseOrLog(syncRequest('POST', server2 + '/set_value', {json: {
           ref: manageAppPath,
           value: {
             admin: { [serviceAdmin]: true },
+            is_public: true
           },
+          nonce: -1,
+          timestamp: 1234567890000,
         }}).body.toString('utf-8')).result;
+        assert.deepEqual(createAppRes, {
+          "result": {
+            "code": 0,
+            "func_results": {
+              "_createApp": {
+                "code": "SUCCESS",
+                "bandwidth_gas_amount": 0,
+                "op_results": {
+                  "0": {
+                    "path": "/apps/test_service_create_app1",
+                    "result": {
+                      "code": 0,
+                      "bandwidth_gas_amount": 1
+                    }
+                  },
+                  "1": {
+                    "path": "/apps/test_service_create_app1",
+                    "result": {
+                      "code": 0,
+                      "bandwidth_gas_amount": 1
+                    }
+                  },
+                  "2": {
+                    "path": "/manage_app/test_service_create_app1/config",
+                    "result": {
+                      "code": 0,
+                      "bandwidth_gas_amount": 1
+                    }
+                  },
+                  "3": {
+                    "path": "/manage_app/test_service_create_app1/create/0/result",
+                    "result": {
+                      "code": 0,
+                      "bandwidth_gas_amount": 1
+                    }
+                  }
+                }
+              }
+            },
+            "bandwidth_gas_amount": 1,
+            "gas_amount_charged": 2763,
+            "gas_amount_total": {
+              "bandwidth": {
+                "app": {
+                  "test_service_create_app1": 2
+                },
+                "service": 3
+              },
+              "state": {
+                "service": 2760
+              }
+            },
+            "gas_cost_total": 0
+          },
+          "tx_hash": "0xaa4625dcf4dfa36d6e9a23b64236b88379cac1338d76b915e843fd7cfeda14bb"
+        });
         if (!(await waitUntilTxFinalized(serverList, createAppRes.tx_hash))) {
           console.error(`Failed to check finalization of tx.`);
         }
+        const appConfig = parseOrLog(syncRequest('GET', 
+            server2 + `/get_value?ref=/manage_app/test_service_create_app1/config`)
+            .body.toString('utf-8')).result;
+        assert.deepEqual(appConfig, {
+          "admin": {
+            "0x00ADEc28B6a845a085e03591bE7550dd68673C1C": true
+          },
+          "is_public": true
+        });
+        const appWriteRule = parseOrLog(syncRequest('GET', 
+            server2 + `/get_rule?ref=/apps/test_service_create_app1`).body.toString('utf-8')).result;
+        assert.deepEqual(appWriteRule, {
+          ".rule": {
+            "write": true
+          }
+        });
+        const appOwnerRule = parseOrLog(syncRequest('GET', 
+            server2 + `/get_owner?ref=/apps/test_service_create_app1`).body.toString('utf-8')).result;
+        assert.deepEqual(appOwnerRule, {
+          ".owner": {
+            "owners": {
+              "*": {
+                "branch_owner": true,
+                "write_function": true,
+                "write_owner": false,
+                "write_rule": true
+              },
+              "0x00ADEc28B6a845a085e03591bE7550dd68673C1C": {
+                "branch_owner": true,
+                "write_function": true,
+                "write_owner": true,
+                "write_rule": true
+              }
+            }
+          }        
+        });
+      });
+    });
+
+    describe('Gas fee', () => {
+      before(async () => {
+        await setUpApp('test_service_gas_fee', serverList, { admin: { [serviceAdmin]: true } });
       });
 
-      it("native function (_transfer) with individual account registration", () => {
+      it("native function (_transfer) with individual account registration", async () => {
         const body = parseOrLog(syncRequest('POST', server2 + '/set_value', {json: {
           ref: triggerTransferToIndividualAccountPath1,
           value: 10,
@@ -3868,45 +4522,53 @@ describe('Blockchain Node', () => {
         assert.deepEqual(_.get(body, 'result.result'), {
           "func_results": {
             "_transfer": {
-              "op_results": [
-                {
+              "op_results": {
+                "0": {
                   "path": "/accounts/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204/balance",
                   "result": {
                     "code": 0,
-                    "gas_amount": 1
+                    "bandwidth_gas_amount": 1
                   }
                 },
-                {
+                "1": {
                   "path": "/accounts/0x107Ab4369070716cEA7f0d34359fa6a99F54951F/balance",
                   "result": {
                     "code": 0,
-                    "gas_amount": 1
+                    "bandwidth_gas_amount": 1
                   }
                 },
-                {
+                "2": {
                   "path": "/transfer/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204/0x107Ab4369070716cEA7f0d34359fa6a99F54951F/0/result",
                   "result": {
                     "code": 0,
-                    "gas_amount": 1
+                    "bandwidth_gas_amount": 1
                   }
                 }
-              ],
+              },
               "code": "SUCCESS",
-              "gas_amount": 1000
+              "bandwidth_gas_amount": 1000
             }
           },
           "code": 0,
-          "gas_amount": 1,
+          "bandwidth_gas_amount": 1,
+          "gas_amount_charged": 2860,
           "gas_amount_total": {
-            "app": {},
-            "service": 1004
+            "bandwidth": {
+              "service": 1004
+            },
+            "state": {
+              "service": 1856
+            }
           },
           "gas_cost_total": 0,
         });
         assert.deepEqual(body.code, 0);
+        if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+          console.error(`Failed to check finalization of tx.`);
+        }
       });
 
-      it("native function (_transfer) without individual account registration", () => {
+      it("native function (_transfer) without individual account registration", async () => {
         const body = parseOrLog(syncRequest('POST', server2 + '/set_value', {json: {
           ref: triggerTransferToIndividualAccountPath2,
           value: 10,
@@ -3916,45 +4578,53 @@ describe('Blockchain Node', () => {
         assert.deepEqual(_.get(body, 'result.result'), {
           "func_results": {
             "_transfer": {
-              "op_results": [
-                {
+              "op_results": {
+                "0": {
                   "path": "/accounts/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204/balance",
                   "result": {
                     "code": 0,
-                    "gas_amount": 1
+                    "bandwidth_gas_amount": 1
                   }
                 },
-                {
+                "1": {
                   "path": "/accounts/0x107Ab4369070716cEA7f0d34359fa6a99F54951F/balance",
                   "result": {
                     "code": 0,
-                    "gas_amount": 1
+                    "bandwidth_gas_amount": 1
                   }
                 },
-                {
+                "2": {
                   "path": "/transfer/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204/0x107Ab4369070716cEA7f0d34359fa6a99F54951F/1/result",
                   "result": {
                     "code": 0,
-                    "gas_amount": 1
+                    "bandwidth_gas_amount": 1
                   }
                 }
-              ],
+              },
               "code": "SUCCESS",
-              "gas_amount": 0
+              "bandwidth_gas_amount": 0
             }
           },
           "code": 0,
-          "gas_amount": 1,
+          "bandwidth_gas_amount": 1,
+          "gas_amount_charged": 1190,
           "gas_amount_total": {
-            "app": {},
-            "service": 4
+            "bandwidth": {
+              "service": 4
+            },
+            "state": {
+              "service": 1186
+            }
           },
           "gas_cost_total": 0,
         });
         assert.deepEqual(body.code, 0);
+        if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+          console.error(`Failed to check finalization of tx.`);
+        }
       });
 
-      it("native function (_transfer) with service account registration", () => {
+      it("native function (_transfer) with service account registration", async () => {
         const body = parseOrLog(syncRequest('POST', server2 + '/set_value', {json: {
           ref: triggerTransferToServiceAccountPath1,
           value: 10,
@@ -3964,81 +4634,89 @@ describe('Blockchain Node', () => {
         assert.deepEqual(_.get(body, 'result.result'), {
           "func_results": {
             "_stake": {
-              "op_results": [
-                {
+              "op_results": {
+                "0": {
                   "path": "/transfer/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204/staking|test_service_gas_fee|0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0/1234567890000/value",
                   "result": {
                     "func_results": {
                       "_transfer": {
-                        "op_results": [
-                          {
+                        "op_results": {
+                          "0": {
                             "path": "/accounts/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204/balance",
                             "result": {
                               "code": 0,
-                              "gas_amount": 1
+                              "bandwidth_gas_amount": 1
                             }
                           },
-                          {
+                          "1": {
                             "path": "/service_accounts/staking/test_service_gas_fee/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0/balance",
                             "result": {
                               "code": 0,
-                              "gas_amount": 1
+                              "bandwidth_gas_amount": 1
                             }
                           },
-                          {
+                          "2": {
                             "path": "/transfer/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204/staking|test_service_gas_fee|0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0/1234567890000/result",
                             "result": {
                               "code": 0,
-                              "gas_amount": 1
+                              "bandwidth_gas_amount": 1
                             }
                           }
-                        ],
+                        },
                         "code": "SUCCESS",
-                        "gas_amount": 1000
+                        "bandwidth_gas_amount": 1000
                       }
                     },
                     "code": 0,
-                    "gas_amount": 1
+                    "bandwidth_gas_amount": 1
                   }
                 },
-                {
+                "1": {
                   "path": "/staking/test_service_gas_fee/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204/0/expire_at",
                   "result": {
                     "code": 0,
-                    "gas_amount": 1
+                    "bandwidth_gas_amount": 1
                   }
                 },
-                {
+                "2": {
                   "path": "/staking/test_service_gas_fee/balance_total",
                   "result": {
                     "code": 0,
-                    "gas_amount": 1
+                    "bandwidth_gas_amount": 1
                   }
                 },
-                {
+                "3": {
                   "path": "/staking/test_service_gas_fee/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204/0/stake/100/result",
                   "result": {
                     "code": 0,
-                    "gas_amount": 1
+                    "bandwidth_gas_amount": 1
                   }
                 }
-              ],
+              },
               "code": "SUCCESS",
-              "gas_amount": 0
+              "bandwidth_gas_amount": 0
             }
           },
           "code": 0,
-          "gas_amount": 1,
+          "bandwidth_gas_amount": 1,
+          "gas_amount_charged": 4906,
           "gas_amount_total": {
-            "app": {},
-            "service": 1008
+            "bandwidth": {
+              "service": 1008
+            },
+            "state": {
+              "service": 3898
+            }
           },
           "gas_cost_total": 0,
         });
         assert.deepEqual(body.code, 0);
+        if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+          console.error(`Failed to check finalization of tx.`);
+        }
       });
 
-      it("native function (_transfer) without service account registration", () => {
+      it("native function (_transfer) without service account registration", async () => {
         const body = parseOrLog(syncRequest('POST', server2 + '/set_value', {json: {
           ref: triggerTransferToServiceAccountPath2,
           value: 10,
@@ -4048,81 +4726,89 @@ describe('Blockchain Node', () => {
         assert.deepEqual(_.get(body, 'result.result'), {
           "func_results": {
             "_stake": {
-              "op_results": [
-                {
+              "op_results": {
+                "0": {
                   "path": "/transfer/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204/staking|test_service_gas_fee|0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0/1234567890001/value",
                   "result": {
                     "func_results": {
                       "_transfer": {
-                        "op_results": [
-                          {
+                        "op_results": {
+                          "0": {
                             "path": "/accounts/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204/balance",
                             "result": {
                               "code": 0,
-                              "gas_amount": 1
+                              "bandwidth_gas_amount": 1
                             }
                           },
-                          {
+                          "1": {
                             "path": "/service_accounts/staking/test_service_gas_fee/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0/balance",
                             "result": {
                               "code": 0,
-                              "gas_amount": 1
+                              "bandwidth_gas_amount": 1
                             }
                           },
-                          {
+                          "2": {
                             "path": "/transfer/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204/staking|test_service_gas_fee|0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0/1234567890001/result",
                             "result": {
                               "code": 0,
-                              "gas_amount": 1
+                              "bandwidth_gas_amount": 1
                             }
                           }
-                        ],
+                        },
                         "code": "SUCCESS",
-                        "gas_amount": 0
+                        "bandwidth_gas_amount": 0
                       }
                     },
                     "code": 0,
-                    "gas_amount": 1
+                    "bandwidth_gas_amount": 1
                   }
                 },
-                {
+                "1": {
                   "path": "/staking/test_service_gas_fee/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204/0/expire_at",
                   "result": {
                     "code": 0,
-                    "gas_amount": 1
+                    "bandwidth_gas_amount": 1
                   }
                 },
-                {
+                "2": {
                   "path": "/staking/test_service_gas_fee/balance_total",
                   "result": {
                     "code": 0,
-                    "gas_amount": 1
+                    "bandwidth_gas_amount": 1
                   }
                 },
-                {
+                "3": {
                   "path": "/staking/test_service_gas_fee/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204/0/stake/101/result",
                   "result": {
                     "code": 0,
-                    "gas_amount": 1
+                    "bandwidth_gas_amount": 1
                   }
                 }
-              ],
+              },
               "code": "SUCCESS",
-              "gas_amount": 0
+              "bandwidth_gas_amount": 0
             }
           },
           "code": 0,
-          "gas_amount": 1,
+          "bandwidth_gas_amount": 1,
+          "gas_amount_charged": 2408,
           "gas_amount_total": {
-            "app": {},
-            "service": 8
+            "bandwidth": {
+              "service": 8
+            },
+            "state": {
+              "service": 2400
+            }
           },
           "gas_cost_total": 0,
         });
         assert.deepEqual(body.code, 0);
+        if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+          console.error(`Failed to check finalization of tx.`);
+        }
       });
 
-      it("REST function with external RPC call", () => {
+      it("REST function with external RPC call", async () => {
         const body = parseOrLog(syncRequest('POST', server2 + '/set_value', {json: {
           ref: triggerRestFunctionPath,
           value: 'some value',
@@ -4131,18 +4817,32 @@ describe('Blockchain Node', () => {
           "func_results": {
             "0x11111": {
               "code": "SUCCESS",
-              "gas_amount": 10,
+              "bandwidth_gas_amount": 10,
             }
           },
           "code": 0,
-          "gas_amount": 1,
+          "bandwidth_gas_amount": 1,
+          "gas_amount_charged": 0,
           "gas_amount_total": {
-            "app": {},
-            "service": 11
+            "bandwidth": {
+              "app": {
+                "test": 11
+              },
+              "service": 0
+            },
+            "state": {
+              "app": {
+                "test": 216
+              },
+              "service": 0
+            }
           },
           "gas_cost_total": 0,
         });
         assert.deepEqual(body.code, 0);
+        if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+          console.error(`Failed to check finalization of tx.`);
+        }
       });
     });
 
@@ -4173,7 +4873,7 @@ describe('Blockchain Node', () => {
         expect(resultCode).to.equal(FunctionResultCode.SUCCESS);
       });
 
-      it('transfer: transfer more than account balance', () => {
+      it('transfer: transfer more than account balance', async () => {
         let fromBeforeBalance = parseOrLog(syncRequest('GET',
             server2 + `/get_value?ref=${transferFromBalancePath}`).body.toString('utf-8')).result;
         let toBeforeBalance = parseOrLog(syncRequest('GET',
@@ -4183,6 +4883,9 @@ describe('Blockchain Node', () => {
           value: fromBeforeBalance + 1
         }}).body.toString('utf-8'));
         expect(body.code).to.equals(1);
+        if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+          console.error(`Failed to check finalization of tx.`);
+        }
         const fromAfterBalance = parseOrLog(syncRequest('GET',
             server2 + `/get_value?ref=${transferFromBalancePath}`).body.toString('utf-8')).result;
         const toAfterBalance = parseOrLog(syncRequest('GET',
@@ -4191,7 +4894,7 @@ describe('Blockchain Node', () => {
         expect(toAfterBalance).to.equal(toBeforeBalance);
       });
 
-      it('transfer: transfer by another address', () => {
+      it('transfer: transfer by another address', async () => {
         let fromBeforeBalance = parseOrLog(syncRequest('GET',
             server2 + `/get_value?ref=${transferFromBalancePath}`).body.toString('utf-8')).result;
         let toBeforeBalance = parseOrLog(syncRequest('GET',
@@ -4201,6 +4904,9 @@ describe('Blockchain Node', () => {
           value: transferAmount
         }}).body.toString('utf-8'));
         expect(body.code).to.equals(1);
+        if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+          console.error(`Failed to check finalization of tx.`);
+        }
         const fromAfterBalance = parseOrLog(syncRequest('GET',
             server2 + `/get_value?ref=${transferFromBalancePath}`).body.toString('utf-8')).result;
         const toAfterBalance = parseOrLog(syncRequest('GET',
@@ -4209,24 +4915,30 @@ describe('Blockchain Node', () => {
         expect(toAfterBalance).to.equal(toBeforeBalance);
       });
 
-      it('transfer: transfer with a duplicated key', () => {
+      it('transfer: transfer with a duplicated key', async () => {
         const body = parseOrLog(syncRequest('POST', server1 + '/set_value', {json: {
           ref: transferPath + '/1/value',
           value: transferAmount
         }}).body.toString('utf-8'));
         expect(body.code).to.equals(1);
+        if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+          console.error(`Failed to check finalization of tx.`);
+        }
       });
 
-      it('transfer: transfer with same addresses', () => {
+      it('transfer: transfer with same addresses', async () => {
         const transferPathSameAddrs = `/transfer/${transferFrom}/${transferFrom}`;
         const body = parseOrLog(syncRequest('POST', server1 + '/set_value', {json: {
           ref: transferPathSameAddrs + '/4/value',
           value: transferAmount
         }}).body.toString('utf-8'));
         expect(body.code).to.equals(1);
+        if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+          console.error(`Failed to check finalization of tx.`);
+        }
       });
 
-      it('transfer: transfer with non-checksum addreess', () => {
+      it('transfer: transfer with non-checksum addreess', async () => {
         const fromLowerCase = _.toLower(transferFrom);
         const transferPathFromLowerCase = `/transfer/${fromLowerCase}/${transferTo}`;
         const bodyFromLowerCase = parseOrLog(syncRequest('POST', server1 + '/set_value', {json: {
@@ -4234,6 +4946,9 @@ describe('Blockchain Node', () => {
           value: transferAmount
         }}).body.toString('utf-8'));
         expect(bodyFromLowerCase.code).to.equals(1);
+        if (!(await waitUntilTxFinalized(serverList, _.get(bodyFromLowerCase, 'result.tx_hash')))) {
+          console.error(`Failed to check finalization of tx.`);
+        }
 
         const toLowerCase = _.toLower(transferTo);
         const transferPathToLowerCase = `/transfer/${transferFrom}/${toLowerCase}`;
@@ -4242,6 +4957,9 @@ describe('Blockchain Node', () => {
           value: transferAmount
         }}).body.toString('utf-8'));
         expect(bodyToLowerCase.code).to.equals(1);
+        if (!(await waitUntilTxFinalized(serverList, _.get(bodyToLowerCase, 'result.tx_hash')))) {
+          console.error(`Failed to check finalization of tx.`);
+        }
 
         const fromUpperCase = _.toLower(transferFrom);
         const transferPathFromUpperCase = `/transfer/${fromUpperCase}/${transferTo}`;
@@ -4250,6 +4968,9 @@ describe('Blockchain Node', () => {
           value: transferAmount
         }}).body.toString('utf-8'));
         expect(bodyFromUpperCase.code).to.equals(1);
+        if (!(await waitUntilTxFinalized(serverList, _.get(bodyFromUpperCase, 'result.tx_hash')))) {
+          console.error(`Failed to check finalization of tx.`);
+        }
 
         const toUpperCase = _.toLower(transferTo);
         const transferPathToUpperCase = `/transfer/${transferFrom}/${toUpperCase}`;
@@ -4258,6 +4979,9 @@ describe('Blockchain Node', () => {
           value: transferAmount
         }}).body.toString('utf-8'));
         expect(bodyToUpperCase.code).to.equals(1);
+        if (!(await waitUntilTxFinalized(serverList, _.get(bodyToUpperCase, 'result.tx_hash')))) {
+          console.error(`Failed to check finalization of tx.`);
+        }
       });
 
       it('transfer: transfer with valid service account service type', async () => {
@@ -4284,36 +5008,41 @@ describe('Blockchain Node', () => {
               "func_results": {
                 "_transfer": {
                   "code": "SUCCESS",
-                  "gas_amount": 1000,
-                  "op_results": [
-                    {
+                  "bandwidth_gas_amount": 1000,
+                  "op_results": {
+                    "0": {
                       "path": "/accounts/0x00ADEc28B6a845a085e03591bE7550dd68673C1C/balance",
                       "result": {
                         "code": 0,
-                        "gas_amount": 1
+                        "bandwidth_gas_amount": 1
                       }
                     },
-                    {
+                    "1": {
                       "path": "/service_accounts/staking/test_service/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0/balance",
                       "result": {
                         "code": 0,
-                        "gas_amount": 1
+                        "bandwidth_gas_amount": 1
                       }
                     },
-                    {
+                    "2": {
                       "path": "/transfer/0x00ADEc28B6a845a085e03591bE7550dd68673C1C/staking|test_service|0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0/1/result",
                       "result": {
                         "code": 0,
-                        "gas_amount": 1
+                        "bandwidth_gas_amount": 1
                       }
                     }
-                  ]
+                  }
                 }
               },
-              "gas_amount": 1,
+              "bandwidth_gas_amount": 1,
+              "gas_amount_charged": 3094,
               "gas_amount_total": {
-                "app": {},
-                "service": 1004
+                "bandwidth": {
+                  "service": 1004
+                },
+                "state": {
+                  "service": 2090
+                }
               },
               "gas_cost_total": 0
             },
@@ -4351,17 +5080,25 @@ describe('Blockchain Node', () => {
           "result": {
             "result": {
               "code": 103,
-              "error_message": "No .write permission on: /transfer/0x00ADEc28B6a845a085e03591bE7550dd68673C1C/invalid_service_type|test_service|0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0/1/value",
-              "gas_amount": 0,
+              "error_message": "No write permission on: /transfer/0x00ADEc28B6a845a085e03591bE7550dd68673C1C/invalid_service_type|test_service|0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0/1/value",
+              "bandwidth_gas_amount": 1,
+              "gas_amount_charged": 1,
               "gas_amount_total": {
-                "app": {},
-                "service": 0
+                "bandwidth": {
+                  "service": 1
+                },
+                "state": {
+                  "service": 0
+                }
               },
               "gas_cost_total": 0
             },
             "tx_hash": "0x6cce46b284beb254c6b67205f5ba00f04c85028d7457410b4fa4b4d8522c14be"
           }
         });
+        if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+          console.error(`Failed to check finalization of tx.`);
+        }
         const fromAfterBalance = parseOrLog(syncRequest('GET',
             server1 + `/get_value?ref=${transferFromBalancePath}`).body.toString('utf-8')).result;
         expect(fromAfterBalance).to.equal(fromBeforeBalance);
@@ -4370,28 +5107,12 @@ describe('Blockchain Node', () => {
 
     describe('Staking: _stake, _unstake', () => {
       before(async () => {
-        const appStakingPath = `/staking/test_service_staking/${serviceAdmin}/0/stake/${Date.now()}/value`
-        const appStakingRes = parseOrLog(syncRequest('POST', server1 + '/set_value', {json: {
-          ref: appStakingPath,
-          value: 1
-        }}).body.toString('utf-8')).result;
-        if (!(await waitUntilTxFinalized(serverList, appStakingRes.tx_hash))) {
-          console.error(`Failed to check finalization of tx.`);
-        }
-        const manageAppPath = '/manage_app/test_service_staking/create/1'
-        const body = parseOrLog(syncRequest('POST', server2 + '/set_value', {json: {
-          ref: manageAppPath,
-          value: {
-            admin: { [serviceAdmin]: true },
-            service: {
-              staking: { lockup_duration: 1000 }
-            }
+        await setUpApp('test_service_staking', serverList, {
+          admin: { [serviceAdmin]: true },
+          service: {
+            staking: { lockup_duration: 1000 }
           }
-        }}).body.toString('utf-8'));
-        expect(body.code).to.equals(0);
-        if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
-          console.error(`Failed to check finalization of tx.`);
-        }
+        });
       })
 
       describe('Stake', () => {
@@ -4411,72 +5132,77 @@ describe('Blockchain Node', () => {
             "func_results": {
               "_stake": {
                 "code": "SUCCESS",
-                "gas_amount": 0,
-                "op_results": [
-                  {
+                "bandwidth_gas_amount": 0,
+                "op_results": {
+                  "0": {
                     "path": "/transfer/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204/staking|test_service_staking|0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0/1234567890000/value",
                     "result": {
                       "code": 0,
                       "func_results": {
                         "_transfer": {
                           "code": "SUCCESS",
-                          "gas_amount": 1000,
-                          "op_results": [
-                            {
+                          "bandwidth_gas_amount": 1000,
+                          "op_results": {
+                            "0": {
                               "path": "/accounts/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204/balance",
                               "result": {
                                 "code": 0,
-                                "gas_amount": 1,
+                                "bandwidth_gas_amount": 1,
                               }
                             },
-                            {
+                            "1": {
                               "path": "/service_accounts/staking/test_service_staking/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0/balance",
                               "result": {
                                 "code": 0,
-                                "gas_amount": 1,
+                                "bandwidth_gas_amount": 1,
                               }
                             },
-                            {
+                            "2": {
                               "path": "/transfer/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204/staking|test_service_staking|0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0/1234567890000/result",
                               "result": {
                                 "code": 0,
-                                "gas_amount": 1,
+                                "bandwidth_gas_amount": 1,
                               }
                             }
-                          ]
+                          }
                         }
                       },
-                      "gas_amount": 1,
+                      "bandwidth_gas_amount": 1,
                     }
                   },
-                  {
+                  "1": {
                     "path": "/staking/test_service_staking/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204/0/expire_at",
                     "result": {
                       "code": 0,
-                      "gas_amount": 1,
+                      "bandwidth_gas_amount": 1,
                     }
                   },
-                  {
+                  "2": {
                     "path": "/staking/test_service_staking/balance_total",
                     "result": {
                       "code": 0,
-                      "gas_amount": 1,
+                      "bandwidth_gas_amount": 1,
                     }
                   },
-                  {
+                  "3": {
                     "path": "/staking/test_service_staking/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204/0/stake/1/result",
                     "result": {
                       "code": 0,
-                      "gas_amount": 1,
+                      "bandwidth_gas_amount": 1,
                     }
                   }
-                ]
+                }
               }
             },
-            "gas_amount": 1,
+            "bandwidth_gas_amount": 1,
+            "gas_amount_charged": 4902,
             "gas_amount_total": {
-              "app": {},
-              "service": 1008
+              "bandwidth": {
+                "service": 1008
+              },
+              "state": {
+                "service": 3894
+              }
             },
             "gas_cost_total": 0,
           });
@@ -4503,7 +5229,7 @@ describe('Blockchain Node', () => {
           expect(stakingAppBalanceTotal).to.equal(stakeAmount + 1);
         });
 
-        it('stake: stake more than account balance', () => {
+        it('stake: stake more than account balance', async () => {
           const beforeBalance = parseOrLog(syncRequest('GET', server2 +
               `/get_value?ref=/accounts/${serviceUser}/balance`).body.toString('utf-8')).result;
           const beforeStakingAccountBalance = parseOrLog(syncRequest('GET',
@@ -4513,6 +5239,9 @@ describe('Blockchain Node', () => {
             value: beforeBalance + 1
           }}).body.toString('utf-8'));
           expect(body.code).to.equals(1);
+          if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+            console.error(`Failed to check finalization of tx.`);
+          }
           const afterStakingAccountBalance = parseOrLog(syncRequest('GET',
               server2 + `/get_value?ref=${stakingServiceAccountBalancePath}`).body.toString('utf-8')).result;
           const afterBalance = parseOrLog(syncRequest('GET',
@@ -4521,7 +5250,7 @@ describe('Blockchain Node', () => {
           expect(afterBalance).to.equal(beforeBalance);
         });
 
-        it('stake: stake by another address', () => {
+        it('stake: stake by another address', async () => {
           const beforeStakingAccountBalance = parseOrLog(syncRequest('GET',
               server2 + `/get_value?ref=${stakingServiceAccountBalancePath}`).body.toString('utf-8')).result;
           const body = parseOrLog(syncRequest('POST', server3 + '/set_value', {json: {
@@ -4529,6 +5258,9 @@ describe('Blockchain Node', () => {
             value: stakeAmount
           }}).body.toString('utf-8'));
           expect(body.code).to.equals(1);
+          if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+            console.error(`Failed to check finalization of tx.`);
+          }
           const stakeRequest = parseOrLog(syncRequest('GET',
               server2 + `/get_value?ref=${stakePath}/3`).body.toString('utf-8')).result;
           const afterStakingAccountBalance = parseOrLog(syncRequest('GET',
@@ -4575,37 +5307,45 @@ describe('Blockchain Node', () => {
               "func_results": {
                 "_stake": {
                   "code": "FAILURE",
-                  "gas_amount": 0,
-                  "op_results": [
-                    {
+                  "bandwidth_gas_amount": 0,
+                  "op_results": {
+                    "0": {
                       "path": "/staking/test_service_staking/0x07A43138CC760C85A5B1F115aa60eADEaa0bf417/0/stake/1/result",
                       "result": {
                         "code": 0,
-                        "gas_amount": 1,
+                        "bandwidth_gas_amount": 1,
                       }
                     }
-                  ]
+                  }
                 }
               },
-              "gas_amount": 1,
+              "bandwidth_gas_amount": 1,
+              "gas_amount_charged": 2,
               "gas_amount_total": {
-                "app": {},
-                "service": 2
+                "bandwidth": {
+                  "service": 2
+                },
+                "state": {
+                  "service": 0
+                }
               },
               "gas_cost_total": 0,
             });
           });
         });
 
-        it('stake: stake with the same record_id', () => {
+        it('stake: stake with the same record_id', async () => {
           const body = parseOrLog(syncRequest('POST', server2 + '/set_value', {json: {
             ref: stakePath + '/1/value',
             value: stakeAmount
           }}).body.toString('utf-8'));
           expect(body.code).to.equals(1);
+          if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+            console.error(`Failed to check finalization of tx.`);
+          }
         });
 
-        it('stake: stake with non-checksum addreess', () => {
+        it('stake: stake with non-checksum addreess', async () => {
           const addrLowerCase = _.toLower(serviceUser);
           const stakePathLowerCase = `/staking/checksum_addr_test_service/${addrLowerCase}/0/stake`;
           const bodyLowerCase = parseOrLog(syncRequest('POST', server2 + '/set_value', {json: {
@@ -4613,6 +5353,9 @@ describe('Blockchain Node', () => {
             value: stakeAmount
           }}).body.toString('utf-8'));
           expect(bodyLowerCase.code).to.equals(1);
+          if (!(await waitUntilTxFinalized(serverList, _.get(bodyLowerCase, 'result.tx_hash')))) {
+            console.error(`Failed to check finalization of tx.`);
+          }
 
           const addrUpperCase = _.toUpper(serviceUser);
           const stakePathUpperCase = `/staking/checksum_addr_test_service/${addrUpperCase}/0/stake`;
@@ -4621,11 +5364,14 @@ describe('Blockchain Node', () => {
             value: stakeAmount
           }}).body.toString('utf-8'));
           expect(bodyUpperCase.code).to.equals(1);
+          if (!(await waitUntilTxFinalized(serverList, _.get(bodyUpperCase, 'result.tx_hash')))) {
+            console.error(`Failed to check finalization of tx.`);
+          }
         });
       });
 
       describe('Unstake', () => {
-        it('unstake: unstake by another address', () => {
+        it('unstake: unstake by another address', async () => {
           let beforeBalance = parseOrLog(syncRequest('GET',
               server2 + `/get_value?ref=/accounts/${serviceUserBad}/balance`)
               .body.toString('utf-8')).result;
@@ -4636,6 +5382,9 @@ describe('Blockchain Node', () => {
             value: stakeAmount
           }}).body.toString('utf-8'));
           expect(body.code).to.equals(1);
+          if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+            console.error(`Failed to check finalization of tx.`);
+          }
           const unstakeRequest = parseOrLog(syncRequest('GET',
               server2 + `/get_value?ref=${unstakePath}/1`).body.toString('utf-8')).result;
           const afterStakingAccountBalance = parseOrLog(syncRequest('GET',
@@ -4648,7 +5397,7 @@ describe('Blockchain Node', () => {
           expect(balance).to.equal(beforeBalance);
         });
 
-        it('unstake: unstake more than staked amount', () => {
+        it('unstake: unstake more than staked amount', async () => {
           let beforeBalance = parseOrLog(syncRequest('GET',
               server2 + `/get_value?ref=${serviceUserBalancePath}`).body.toString('utf-8')).result;
           let beforeStakingAccountBalance = parseOrLog(syncRequest('GET',
@@ -4658,6 +5407,9 @@ describe('Blockchain Node', () => {
             value: beforeStakingAccountBalance + 1
           }}).body.toString('utf-8'));
           expect(body.code).to.equals(1);
+          if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+            console.error(`Failed to check finalization of tx.`);
+          }
           const afterStakingAccountBalance = parseOrLog(syncRequest('GET',
               server2 + `/get_value?ref=${stakingServiceAccountBalancePath}`).body.toString('utf-8')).result;
           const balance = parseOrLog(syncRequest('GET',
@@ -4682,65 +5434,70 @@ describe('Blockchain Node', () => {
             "func_results": {
               "_unstake": {
                 "code": "SUCCESS",
-                "gas_amount": 0,
-                "op_results": [
-                  {
+                "bandwidth_gas_amount": 0,
+                "op_results": {
+                  "0": {
                     "path": "/transfer/staking|test_service_staking|0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204/1234567890000/value",
                     "result": {
                       "code": 0,
                       "func_results": {
                         "_transfer": {
                           "code": "SUCCESS",
-                          "gas_amount": 0,
-                          "op_results": [
-                            {
+                          "bandwidth_gas_amount": 0,
+                          "op_results": {
+                            "0": {
                               "path": "/service_accounts/staking/test_service_staking/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0/balance",
                               "result": {
                                 "code": 0,
-                                "gas_amount": 1,
+                                "bandwidth_gas_amount": 1,
                               }
                             },
-                            {
+                            "1": {
                               "path": "/accounts/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204/balance",
                               "result": {
                                 "code": 0,
-                                "gas_amount": 1,
+                                "bandwidth_gas_amount": 1,
                               }
                             },
-                            {
+                            "2": {
                               "path": "/transfer/staking|test_service_staking|0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204/1234567890000/result",
                               "result": {
                                 "code": 0,
-                                "gas_amount": 1,
+                                "bandwidth_gas_amount": 1,
                               }
                             }
-                          ]
+                          }
                         }
                       },
-                      "gas_amount": 1,
+                      "bandwidth_gas_amount": 1,
                     }
                   },
-                  {
+                  "1": {
                     "path": "/staking/test_service_staking/balance_total",
                     "result": {
                       "code": 0,
-                      "gas_amount": 1,
+                      "bandwidth_gas_amount": 1,
                     }
                   },
-                  {
+                  "2": {
                     "path": "/staking/test_service_staking/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204/0/unstake/2/result",
                     "result": {
                       "code": 0,
-                      "gas_amount": 1,
+                      "bandwidth_gas_amount": 1,
                     }
                   }
-                ]
+                }
               }
             },
-            "gas_amount": 1,
+            "bandwidth_gas_amount": 1,
+            "gas_amount_charged": 3127,
             "gas_amount_total": {
-              "app": {},
-              "service": 7
+              "bandwidth": {
+                "service": 7
+              },
+              "state": {
+                "service": 3120
+              }
             },
             "gas_cost_total": 0,
           });
@@ -4798,28 +5555,10 @@ describe('Blockchain Node', () => {
 
     describe('Payments: _pay, _claim', () => {
       before(async () => {
-        const appStakingPath = `/staking/test_service_payment/${serviceAdmin}/0/stake/${Date.now()}/value`
-        const appStakingRes = parseOrLog(syncRequest('POST', server1 + '/set_value', {json: {
-          ref: appStakingPath,
-          value: 1
-        }}).body.toString('utf-8')).result;
-        if (!(await waitUntilTxFinalized(serverList, appStakingRes.tx_hash))) {
-          console.error(`Failed to check finalization of tx.`);
-        }
-        const manageAppPath = '/manage_app/test_service_payment/create/1'
-        const body = parseOrLog(syncRequest('POST', server2 + '/set_value', {json: {
-          ref: manageAppPath,
-          value: {
-            admin: { [serviceAdmin]: true },
-          },
-        }}).body.toString('utf-8'));
-        expect(body.code).to.equals(0);
-        if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
-          console.error(`Failed to check finalization of tx.`);
-        }
+        await setUpApp('test_service_payment', serverList, { admin: { [serviceAdmin]: true } });
       });
 
-      it('payments: non-app admin cannot write pay records', () => {
+      it('payments: non-app admin cannot write pay records', async () => {
         const body = parseOrLog(syncRequest('POST', server2 + '/set_value', {json: {
               ref: `/payments/test_service_payment/${serviceUser}/0/pay/key1`,
               value: {
@@ -4827,9 +5566,12 @@ describe('Blockchain Node', () => {
               }
             }}).body.toString('utf-8'));
         expect(body.code).to.equals(1);
+        if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+          console.error(`Failed to check finalization of tx.`);
+        }
       });
 
-      it('payments: amount = 0', () => {
+      it('payments: amount = 0', async () => {
         const payRef = `/payments/test_service_payment/${serviceUser}/0/pay/key1`;
         const body = parseOrLog(syncRequest('POST', server1 + '/set_value', {json: {
           ref: payRef,
@@ -4838,9 +5580,12 @@ describe('Blockchain Node', () => {
           }
         }}).body.toString('utf-8'));
         expect(body.code).to.equals(1);
+        if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+          console.error(`Failed to check finalization of tx.`);
+        }
       });
 
-      it('payments: amount is not a number', () => {
+      it('payments: amount is not a number', async () => {
         const payRef = `/payments/test_service_payment/${serviceUser}/0/pay/key1`;
         const body = parseOrLog(syncRequest('POST', server1 + '/set_value', {json: {
           ref: payRef,
@@ -4849,9 +5594,12 @@ describe('Blockchain Node', () => {
           }
         }}).body.toString('utf-8'));
         expect(body.code).to.equals(1);
+        if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+          console.error(`Failed to check finalization of tx.`);
+        }
       });
 
-      it('payments: payment amount > admin balance', () => {
+      it('payments: payment amount > admin balance', async () => {
         const adminBalance = parseOrLog(syncRequest('GET', server1 +
             `/get_value?ref=/accounts/${serviceAdmin}/balance`).body.toString('utf-8')).result;
         const payRef = `/payments/test_service_payment/${serviceUser}/0/pay/key1`;
@@ -4862,6 +5610,9 @@ describe('Blockchain Node', () => {
           }
         }}).body.toString('utf-8'));
         expect(body.code).to.equals(1);
+        if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+          console.error(`Failed to check finalization of tx.`);
+        }
       });
 
       it('payments: app admin can write pay records', async () => {
@@ -4882,58 +5633,63 @@ describe('Blockchain Node', () => {
           "func_results": {
             "_pay": {
               "code": "SUCCESS",
-              "gas_amount": 0,
-              "op_results": [
-                {
+              "bandwidth_gas_amount": 0,
+              "op_results": {
+                "0": {
                   "path": "/transfer/0x00ADEc28B6a845a085e03591bE7550dd68673C1C/payments|test_service_payment|0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0/1234567890000/value",
                   "result": {
                     "code": 0,
                     "func_results": {
                       "_transfer": {
                         "code": "SUCCESS",
-                        "gas_amount": 1000,
-                        "op_results": [
-                          {
+                        "bandwidth_gas_amount": 1000,
+                        "op_results": {
+                          "0": {
                             "path": "/accounts/0x00ADEc28B6a845a085e03591bE7550dd68673C1C/balance",
                             "result": {
                               "code": 0,
-                              "gas_amount": 1,
+                              "bandwidth_gas_amount": 1,
                             }
                           },
-                          {
+                          "1": {
                             "path": "/service_accounts/payments/test_service_payment/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0/balance",
                             "result": {
                               "code": 0,
-                              "gas_amount": 1,
+                              "bandwidth_gas_amount": 1,
                             }
                           },
-                          {
+                          "2": {
                             "path": "/transfer/0x00ADEc28B6a845a085e03591bE7550dd68673C1C/payments|test_service_payment|0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0/1234567890000/result",
                             "result": {
                               "code": 0,
-                              "gas_amount": 1,
+                              "bandwidth_gas_amount": 1,
                             }
                           }
-                        ]
+                        }
                       }
                     },
-                    "gas_amount": 1,
+                    "bandwidth_gas_amount": 1,
                   }
                 },
-                {
+                "1": {
                   "path": "/payments/test_service_payment/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204/0/pay/key2/result",
                   "result": {
                     "code": 0,
-                    "gas_amount": 1,
+                    "bandwidth_gas_amount": 1,
                   }
                 }
-              ]
+              }
             }
           },
-          "gas_amount": 1,
+          "bandwidth_gas_amount": 1,
+          "gas_amount_charged": 5472,
           "gas_amount_total": {
-            "app": {},
-            "service": 1006
+            "bandwidth": {
+              "service": 1006
+            },
+            "state": {
+              "service": 4466
+            }
           },
           "gas_cost_total": 0,
         });
@@ -4953,7 +5709,7 @@ describe('Blockchain Node', () => {
         assert.deepEqual(serviceAccountBalance, amount);
       });
 
-      it('payments: non-app admin cannot write claim records', () => {
+      it('payments: non-app admin cannot write claim records', async () => {
         const body = parseOrLog(syncRequest('POST', server2 + '/set_value', {json: {
               ref: `/payments/test_service_payment/${serviceUser}/0/claim/key1`,
               value: {
@@ -4962,9 +5718,12 @@ describe('Blockchain Node', () => {
               }
             }}).body.toString('utf-8'));
         expect(body.code).to.equals(1);
+        if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+          console.error(`Failed to check finalization of tx.`);
+        }
       });
 
-      it('payments: claim amount > payment balance', () => {
+      it('payments: claim amount > payment balance', async () => {
         const paymentBalance = parseOrLog(syncRequest('GET',
             server1 + `/get_value?ref=/service_accounts/payments/test_service_payment/${serviceUser}|0/balance`)
             .body.toString('utf-8')).result;
@@ -4977,9 +5736,12 @@ describe('Blockchain Node', () => {
           }
         }}).body.toString('utf-8'));
         expect(body.code).to.equals(1);
+        if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+          console.error(`Failed to check finalization of tx.`);
+        }
       });
 
-      it('payments: invalid claim target', () => {
+      it('payments: invalid claim target', async () => {
         const paymentBalance = parseOrLog(syncRequest('GET',
             server1 + `/get_value?ref=/service_accounts/payments/test_service_payment/${serviceUser}|0/balance`)
             .body.toString('utf-8')).result;
@@ -4992,6 +5754,9 @@ describe('Blockchain Node', () => {
           }
         }}).body.toString('utf-8'));
         expect(body.code).to.equals(1);
+        if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+          console.error(`Failed to check finalization of tx.`);
+        }
       });
 
       it('payments: app admin can claim payments with individual account target', async () => {
@@ -5015,58 +5780,63 @@ describe('Blockchain Node', () => {
           "func_results": {
             "_claim": {
               "code": "SUCCESS",
-              "gas_amount": 0,
-              "op_results": [
-                {
+              "bandwidth_gas_amount": 0,
+              "op_results": {
+                "0": {
                   "path": "/transfer/payments|test_service_payment|0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0/0x00ADEc28B6a845a085e03591bE7550dd68673C1C/1234567890000/value",
                   "result": {
                     "code": 0,
                     "func_results": {
                       "_transfer": {
                         "code": "SUCCESS",
-                        "gas_amount": 0,
-                        "op_results": [
-                          {
+                        "bandwidth_gas_amount": 0,
+                        "op_results": {
+                          "0": {
                             "path": "/service_accounts/payments/test_service_payment/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0/balance",
                             "result": {
                               "code": 0,
-                              "gas_amount": 1,
+                              "bandwidth_gas_amount": 1,
                             }
                           },
-                          {
+                          "1": {
                             "path": "/accounts/0x00ADEc28B6a845a085e03591bE7550dd68673C1C/balance",
                             "result": {
                               "code": 0,
-                              "gas_amount": 1,
+                              "bandwidth_gas_amount": 1,
                             }
                           },
-                          {
+                          "2": {
                             "path": "/transfer/payments|test_service_payment|0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0/0x00ADEc28B6a845a085e03591bE7550dd68673C1C/1234567890000/result",
                             "result": {
                               "code": 0,
-                              "gas_amount": 1,
+                              "bandwidth_gas_amount": 1,
                             }
                           }
-                        ]
+                        }
                       }
                     },
-                    "gas_amount": 1,
+                    "bandwidth_gas_amount": 1,
                   }
                 },
-                {
+                "1": {
                   "path": "/payments/test_service_payment/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204/0/claim/key2/result",
                   "result": {
                     "code": 0,
-                    "gas_amount": 1,
+                    "bandwidth_gas_amount": 1,
                   }
                 }
-              ]
+              }
             }
           },
-          "gas_amount": 1,
+          "bandwidth_gas_amount": 1,
+          "gas_amount_charged": 3388,
           "gas_amount_total": {
-            "app": {},
-            "service": 6
+            "bandwidth": {
+              "service": 6
+            },
+            "state": {
+              "service": 3382
+            }
           },
           "gas_cost_total": 0,
         });
@@ -5212,25 +5982,7 @@ describe('Blockchain Node', () => {
 
     describe('Escrow: _hold, _release', () => {
       before(async () => {
-        const appStakingPath = `/staking/test_service_escrow/${serviceAdmin}/0/stake/${Date.now()}/value`
-        const appStakingRes = parseOrLog(syncRequest('POST', server1 + '/set_value', {json: {
-          ref: appStakingPath,
-          value: 1
-        }}).body.toString('utf-8')).result;
-        if (!(await waitUntilTxFinalized(serverList, appStakingRes.tx_hash))) {
-          console.error(`Failed to check finalization of tx.`);
-        }
-        const manageAppPath = '/manage_app/test_service_escrow/create/1'
-        const body = parseOrLog(syncRequest('POST', server2 + '/set_value', {json: {
-          ref: manageAppPath,
-          value: {
-            admin: { [serviceAdmin]: true },
-          },
-        }}).body.toString('utf-8'));
-        expect(body.code).to.equals(0);
-        if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
-          console.error(`Failed to check finalization of tx.`);
-        }
+        await setUpApp('test_service_escrow', serverList, { admin: { [serviceAdmin]: true } });
       });
 
       describe('Escrow: individual -> individual', () => {
@@ -5248,10 +6000,15 @@ describe('Blockchain Node', () => {
           }}).body.toString('utf-8'));
           assert.deepEqual(_.get(body, 'result.result'), {
             "code": 0,
-            "gas_amount": 1,
+            "bandwidth_gas_amount": 1,
+            "gas_amount_charged": 1241,
             "gas_amount_total": {
-              "app": {},
-              "service": 1
+              "bandwidth": {
+                "service": 1
+              },
+              "state": {
+                "service": 1240
+              }
             },
             "gas_cost_total": 0,
           });
@@ -5264,7 +6021,7 @@ describe('Blockchain Node', () => {
           assert.deepEqual(escrowAccountConfig, { admin: { [serviceAdmin]: true } });
         });
 
-        it("escrow: individual -> individual: cannot open escrow if it's already open", () => {
+        it("escrow: individual -> individual: cannot open escrow if it's already open", async () => {
           const configRef = `/escrow/${serviceUser}/${serviceAdmin}/0/config`;
           const body = parseOrLog(syncRequest('POST', server2 + '/set_value', {json: {
             ref: configRef,
@@ -5275,9 +6032,12 @@ describe('Blockchain Node', () => {
             }
           }}).body.toString('utf-8'));
           expect(body.code).to.equals(1);
+          if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+            console.error(`Failed to check finalization of tx.`);
+          }
         });
 
-        it("escrow: individual -> individual: non-source account cannot write hold", () => {
+        it("escrow: individual -> individual: non-source account cannot write hold", async () => {
           const key = 1234567890000 + 1;
           const holdRef = `/escrow/${serviceUser}/${serviceAdmin}/0/hold/${key}`;
           const userBalanceBefore = parseOrLog(syncRequest('GET', server1 +
@@ -5289,6 +6049,9 @@ describe('Blockchain Node', () => {
             }
           }}).body.toString('utf-8'));
           expect(body.code).to.equals(1);
+          if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+            console.error(`Failed to check finalization of tx.`);
+          }
         });
 
         it("escrow: individual -> individual: source account can write hold", async () => {
@@ -5309,58 +6072,63 @@ describe('Blockchain Node', () => {
             "func_results": {
               "_hold": {
                 "code": "SUCCESS",
-                "gas_amount": 0,
-                "op_results": [
-                  {
+                "bandwidth_gas_amount": 0,
+                "op_results": {
+                  "0": {
                     "path": "/transfer/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204/escrow|escrow|0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204:0x00ADEc28B6a845a085e03591bE7550dd68673C1C:0/1234567890000/value",
                     "result": {
                       "code": 0,
                       "func_results": {
                         "_transfer": {
                           "code": "SUCCESS",
-                          "gas_amount": 1000,
-                          "op_results": [
-                            {
+                          "bandwidth_gas_amount": 1000,
+                          "op_results": {
+                            "0": {
                               "path": "/accounts/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204/balance",
                               "result": {
                                 "code": 0,
-                                "gas_amount": 1,
+                                "bandwidth_gas_amount": 1,
                               }
                             },
-                            {
+                            "1": {
                               "path": "/service_accounts/escrow/escrow/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204:0x00ADEc28B6a845a085e03591bE7550dd68673C1C:0/balance",
                               "result": {
                                 "code": 0,
-                                "gas_amount": 1,
+                                "bandwidth_gas_amount": 1,
                               }
                             },
-                            {
+                            "2": {
                               "path": "/transfer/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204/escrow|escrow|0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204:0x00ADEc28B6a845a085e03591bE7550dd68673C1C:0/1234567890000/result",
                               "result": {
                                 "code": 0,
-                                "gas_amount": 1,
+                                "bandwidth_gas_amount": 1,
                               }
                             }
-                          ]
+                          }
                         }
                       },
-                      "gas_amount": 1,
+                      "bandwidth_gas_amount": 1,
                     }
                   },
-                  {
+                  "1": {
                     "path": "/escrow/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204/0x00ADEc28B6a845a085e03591bE7550dd68673C1C/0/hold/1234567890002/result",
                     "result": {
                       "code": 0,
-                      "gas_amount": 1,
+                      "bandwidth_gas_amount": 1,
                     }
                   }
-                ]
+                }
               }
             },
-            "gas_amount": 1,
+            "bandwidth_gas_amount": 1,
+            "gas_amount_charged": 4474,
             "gas_amount_total": {
-              "app": {},
-              "service": 1006
+              "bandwidth": {
+                "service": 1006
+              },
+              "state": {
+                "service": 3468
+              }
             },
             "gas_cost_total": 0,
           });
@@ -5377,7 +6145,7 @@ describe('Blockchain Node', () => {
           expect(escrowServiceAccountBalance).to.equals(userBalanceBefore);
         });
 
-        it("escrow: individual -> individual: non-admin account cannot write release", () => {
+        it("escrow: individual -> individual: non-admin account cannot write release", async () => {
           const key = 1234567890000 + 3;
           const releaseRef = `/escrow/${serviceUser}/${serviceAdmin}/0/release/${key}`;
           const body = parseOrLog(syncRequest('POST', server2 + '/set_value', {json: {
@@ -5387,9 +6155,12 @@ describe('Blockchain Node', () => {
             }
           }}).body.toString('utf-8'));
           expect(body.code).to.equals(1);
+          if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+            console.error(`Failed to check finalization of tx.`);
+          }
         });
 
-        it("escrow: individual -> individual: invalid ratio (ratio = -1)", () => {
+        it("escrow: individual -> individual: invalid ratio (ratio = -1)", async () => {
           const key = 1234567890000 + 4;
           const releaseRef = `/escrow/${serviceUser}/${serviceAdmin}/0/release/${key}`;
           const body = parseOrLog(syncRequest('POST', server1 + '/set_value', {json: {
@@ -5399,9 +6170,12 @@ describe('Blockchain Node', () => {
             }
           }}).body.toString('utf-8'));
           expect(body.code).to.equals(1);
+          if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+            console.error(`Failed to check finalization of tx.`);
+          }
         });
 
-        it("escrow: individual -> individual: invalid ratio (ratio = 1.1)", () => {
+        it("escrow: individual -> individual: invalid ratio (ratio = 1.1)", async () => {
           const key = 1234567890000 + 5;
           const releaseRef = `/escrow/${serviceUser}/${serviceAdmin}/0/release/${key}`;
           const body = parseOrLog(syncRequest('POST', server1 + '/set_value', {json: {
@@ -5411,6 +6185,9 @@ describe('Blockchain Node', () => {
             }
           }}).body.toString('utf-8'));
           expect(body.code).to.equals(1);
+          if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+            console.error(`Failed to check finalization of tx.`);
+          }
         });
 
         it("escrow: individual -> individual: admin account can write release (ratio = 0)", async () => {
@@ -5434,58 +6211,63 @@ describe('Blockchain Node', () => {
             "func_results": {
               "_release": {
                 "code": "SUCCESS",
-                "gas_amount": 0,
-                "op_results": [
-                  {
+                "bandwidth_gas_amount": 0,
+                "op_results": {
+                  "0": {
                     "path": "/transfer/escrow|escrow|0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204:0x00ADEc28B6a845a085e03591bE7550dd68673C1C:0/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204/1234567890000/value",
                     "result": {
                       "code": 0,
                       "func_results": {
                         "_transfer": {
                           "code": "SUCCESS",
-                          "gas_amount": 0,
-                          "op_results": [
-                            {
+                          "bandwidth_gas_amount": 0,
+                          "op_results": {
+                            "0": {
                               "path": "/service_accounts/escrow/escrow/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204:0x00ADEc28B6a845a085e03591bE7550dd68673C1C:0/balance",
                               "result": {
                                 "code": 0,
-                                "gas_amount": 1,
+                                "bandwidth_gas_amount": 1,
                               }
                             },
-                            {
+                            "1": {
                               "path": "/accounts/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204/balance",
                               "result": {
                                 "code": 0,
-                                "gas_amount": 1,
+                                "bandwidth_gas_amount": 1,
                               }
                             },
-                            {
+                            "2": {
                               "path": "/transfer/escrow|escrow|0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204:0x00ADEc28B6a845a085e03591bE7550dd68673C1C:0/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204/1234567890000/result",
                               "result": {
                                 "code": 0,
-                                "gas_amount": 1,
+                                "bandwidth_gas_amount": 1,
                               }
                             }
-                          ]
+                          }
                         }
                       },
-                      "gas_amount": 1,
+                      "bandwidth_gas_amount": 1,
                     }
                   },
-                  {
+                  "1": {
                     "path": "/escrow/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204/0x00ADEc28B6a845a085e03591bE7550dd68673C1C/0/release/1234567890006/result",
                     "result": {
                       "code": 0,
-                      "gas_amount": 1,
+                      "bandwidth_gas_amount": 1,
                     }
                   }
-                ]
+                }
               }
             },
-            "gas_amount": 1,
+            "bandwidth_gas_amount": 1,
+            "gas_amount_charged": 3206,
             "gas_amount_total": {
-              "app": {},
-              "service": 6
+              "bandwidth": {
+                "service": 6
+              },
+              "state": {
+                "service": 3200
+              }
             },
             "gas_cost_total": 0,
           });
@@ -5547,10 +6329,15 @@ describe('Blockchain Node', () => {
           }}).body.toString('utf-8'));
           assert.deepEqual(_.get(body, 'result.result'), {
             "code": 0,
-            "gas_amount": 1,
+            "bandwidth_gas_amount": 1,
+            "gas_amount_charged": 1303,
             "gas_amount_total": {
-              "app": {},
-              "service": 1
+              "bandwidth": {
+                "service": 1
+              },
+              "state": {
+                "service": 1302
+              }
             },
             "gas_cost_total": 0,
           });
@@ -5563,7 +6350,7 @@ describe('Blockchain Node', () => {
           assert.deepEqual(escrowAccountConfig, { admin: { [serviceAdmin]: true } });
         });
 
-        it("escrow: service -> individual: non-service admin cannot write hold", () => {
+        it("escrow: service -> individual: non-service admin cannot write hold", async () => {
           const key = 1234567890000 + 102;
           const source = `payments|test_service_escrow|${serviceUser}|0`;
           const target = serviceAdmin;
@@ -5578,6 +6365,9 @@ describe('Blockchain Node', () => {
             }
           }}).body.toString('utf-8'));
           expect(body.code).to.equals(1);
+          if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+            console.error(`Failed to check finalization of tx.`);
+          }
         });
 
         it("escrow: service -> individual: service admin can write hold", async () => {
@@ -5601,58 +6391,63 @@ describe('Blockchain Node', () => {
             "func_results": {
               "_hold": {
                 "code": "SUCCESS",
-                "gas_amount": 0,
-                "op_results": [
-                  {
+                "bandwidth_gas_amount": 0,
+                "op_results": {
+                  "0": {
                     "path": "/transfer/payments|test_service_escrow|0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0/escrow|escrow|payments|test_service_escrow|0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0:0x00ADEc28B6a845a085e03591bE7550dd68673C1C:1/1234567890000/value",
                     "result": {
                       "code": 0,
                       "func_results": {
                         "_transfer": {
                           "code": "SUCCESS",
-                          "gas_amount": 1000,
-                          "op_results": [
-                            {
+                          "bandwidth_gas_amount": 1000,
+                          "op_results": {
+                            "0": {
                               "path": "/service_accounts/payments/test_service_escrow/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0/balance",
                               "result": {
                                 "code": 0,
-                                "gas_amount": 1,
+                                "bandwidth_gas_amount": 1,
                               }
                             },
-                            {
+                            "1": {
                               "path": "/service_accounts/escrow/escrow/payments|test_service_escrow|0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0:0x00ADEc28B6a845a085e03591bE7550dd68673C1C:1/balance",
                               "result": {
                                 "code": 0,
-                                "gas_amount": 1,
+                                "bandwidth_gas_amount": 1,
                               }
                             },
-                            {
+                            "2": {
                               "path": "/transfer/payments|test_service_escrow|0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0/escrow|escrow|payments|test_service_escrow|0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0:0x00ADEc28B6a845a085e03591bE7550dd68673C1C:1/1234567890000/result",
                               "result": {
                                 "code": 0,
-                                "gas_amount": 1,
+                                "bandwidth_gas_amount": 1,
                               }
                             }
-                          ]
+                          }
                         }
                       },
-                      "gas_amount": 1,
+                      "bandwidth_gas_amount": 1,
                     }
                   },
-                  {
+                  "1": {
                     "path": "/escrow/payments|test_service_escrow|0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0/0x00ADEc28B6a845a085e03591bE7550dd68673C1C/1/hold/1234567890103/result",
                     "result": {
                       "code": 0,
-                      "gas_amount": 1,
+                      "bandwidth_gas_amount": 1,
                     }
                   }
-                ]
+                }
               }
             },
-            "gas_amount": 1,
+            "bandwidth_gas_amount": 1,
+            "gas_amount_charged": 4904,
             "gas_amount_total": {
-              "app": {},
-              "service": 1006
+              "bandwidth": {
+                "service": 1006
+              },
+              "state": {
+                "service": 3898
+              }
             },
             "gas_cost_total": 0,
           });
@@ -5693,58 +6488,63 @@ describe('Blockchain Node', () => {
             "func_results": {
               "_release": {
                 "code": "SUCCESS",
-                "gas_amount": 0,
-                "op_results": [
-                  {
+                "bandwidth_gas_amount": 0,
+                "op_results": {
+                  "0": {
                     "path": "/transfer/escrow|escrow|payments|test_service_escrow|0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0:0x00ADEc28B6a845a085e03591bE7550dd68673C1C:1/payments|test_service_escrow|0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0/1234567890000/value",
                     "result": {
                       "code": 0,
                       "func_results": {
                         "_transfer": {
                           "code": "SUCCESS",
-                          "gas_amount": 0,
-                          "op_results": [
-                            {
+                          "bandwidth_gas_amount": 0,
+                          "op_results": {
+                            "0": {
                               "path": "/service_accounts/escrow/escrow/payments|test_service_escrow|0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0:0x00ADEc28B6a845a085e03591bE7550dd68673C1C:1/balance",
                               "result": {
                                 "code": 0,
-                                "gas_amount": 1,
+                                "bandwidth_gas_amount": 1,
                               }
                             },
-                            {
+                            "1": {
                               "path": "/service_accounts/payments/test_service_escrow/0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0/balance",
                               "result": {
                                 "code": 0,
-                                "gas_amount": 1,
+                                "bandwidth_gas_amount": 1,
                               }
                             },
-                            {
+                            "2": {
                               "path": "/transfer/escrow|escrow|payments|test_service_escrow|0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0:0x00ADEc28B6a845a085e03591bE7550dd68673C1C:1/payments|test_service_escrow|0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0/1234567890000/result",
                               "result": {
                                 "code": 0,
-                                "gas_amount": 1,
+                                "bandwidth_gas_amount": 1,
                               }
                             }
-                          ]
+                          }
                         }
                       },
-                      "gas_amount": 1,
+                      "bandwidth_gas_amount": 1,
                     }
                   },
-                  {
+                  "1": {
                     "path": "/escrow/payments|test_service_escrow|0x01A0980d2D4e418c7F27e1ef539d01A5b5E93204|0/0x00ADEc28B6a845a085e03591bE7550dd68673C1C/1/release/1234567890104/result",
                     "result": {
                       "code": 0,
-                      "gas_amount": 1,
+                      "bandwidth_gas_amount": 1,
                     }
                   }
-                ]
+                }
               }
             },
-            "gas_amount": 1,
+            "bandwidth_gas_amount": 1,
+            "gas_amount_charged": 3330,
             "gas_amount_total": {
-              "app": {},
-              "service": 6
+              "bandwidth": {
+                "service": 6
+              },
+              "state": {
+                "service": 3324
+              }
             },
             "gas_cost_total": 0,
           });
@@ -5840,44 +6640,26 @@ describe('Blockchain Node', () => {
           parseOrLog(syncRequest('GET', server3 + '/get_address').body.toString('utf-8')).result;
       userBalancePathA = `/get_value?ref=/accounts/${billingUserA}/balance`;
       userBalancePathB = `/get_value?ref=/accounts/${billingUserB}/balance`;
-
-      const appStakingRes = parseOrLog(syncRequest('POST', server1 + '/set_value', {json: {
-        ref: `/staking/test_billing/${serviceAdmin}/0/stake/${Date.now()}/value`,
-        value: 1
-      }}).body.toString('utf-8')).result;
-      if (!(await waitUntilTxFinalized(serverList, appStakingRes.tx_hash))) {
-        console.error(`Failed to check finalization of app staking tx.`);
-      }
-
-      const createAppRes = parseOrLog(syncRequest('POST', server2 + '/set_value', {json: {
-        ref: '/manage_app/test_billing/create/0',
-        value: {
-          admin: {
+      const adminConfig = {
+        [serviceAdmin]: true,
+        [billingUserA]: true,
+        [billingUserB]: true
+      };
+      const billingConfig = {
+        A: { 
+          users: {
             [serviceAdmin]: true,
-            [billingUserA]: true,
-            [billingUserB]: true
-          },
-          billing: {
-            A: { 
-              users: {
-                [serviceAdmin]: true,
-                [billingUserA]: true
-              }
-            },
-            B: {
-              users: {
-                [serviceAdmin]: true,
-                [billingUserB]: true
-              }
-            }
+            [billingUserA]: true
           }
         },
-        nonce: -1,
-        timestamp: Date.now(),
-      }}).body.toString('utf-8')).result;
-      if (!(await waitUntilTxFinalized(serverList, createAppRes.tx_hash))) {
-        console.error(`Failed to check finalization of create app tx.`);
-      }
+        B: {
+          users: {
+            [serviceAdmin]: true,
+            [billingUserB]: true
+          }
+        }
+      };
+      await setUpApp('test_billing', serverList, { admin: adminConfig, billing: billingConfig });
 
       const server4Addr =
           parseOrLog(syncRequest('GET', server4 + '/get_address').body.toString('utf-8')).result;
@@ -5957,7 +6739,10 @@ describe('Blockchain Node', () => {
         'GET',
         `${server2}/get_value?ref=/gas_fee/collect/${billingUserA}/${tx.number}/${txRes.tx_hash}/amount`
       ).body.toString('utf-8')).result;
-      assert.deepEqual(gasFeeCollected, gasPrice * MICRO_AIN * txRes.result.gas_amount_total.service);
+      assert.deepEqual(
+        gasFeeCollected,
+        gasPrice * MICRO_AIN * txRes.result.gas_amount_charged
+      );
     });
 
     it('app-dependent service tx: invalid billing param', async () => {
@@ -5984,8 +6769,8 @@ describe('Blockchain Node', () => {
         }
       }).body.toString('utf-8'));
       expect(txResBody.code).to.equals(1);
-      expect(txResBody.result.result.code, 18);
-      expect(txResBody.result.result.error_message.includes('No .write permission on: /gas_fee/collect/billing|test_billing|B'), true);
+      expect(txResBody.result.result.code).to.equals(33);
+      expect(txResBody.result.result.error_message).to.equals("[precheckTxBillingParams] User doesn't have permission to the billing account");
     });
 
     it('app-dependent service tx: billing account', async () => {
@@ -6008,7 +6793,7 @@ describe('Blockchain Node', () => {
           'GET', server2 + billingAccountBalancePathA).body.toString('utf-8')).result;
       assert.deepEqual(
         billingAccountBalanceAfter,
-        billingAccountBalanceBefore - (gasPrice * MICRO_AIN * txRes.result.gas_amount_total.service)
+        billingAccountBalanceBefore - (gasPrice * MICRO_AIN * txRes.result.gas_amount_charged)
       );
     });
 
@@ -6032,7 +6817,10 @@ describe('Blockchain Node', () => {
         'GET',
         `${server2}/get_value?ref=/gas_fee/collect/${billingUserA}/${tx.number}/${txRes.tx_hash}/amount`
       ).body.toString('utf-8')).result;
-      assert.deepEqual(gasFeeCollected, gasPrice * MICRO_AIN * txRes.result.gas_amount_total.service);
+      assert.deepEqual(
+        gasFeeCollected,
+        gasPrice * MICRO_AIN * txRes.result.gas_amount_charged
+      );
     });
 
     it('app-independent service tx: billing account', async () => {
@@ -6055,7 +6843,7 @@ describe('Blockchain Node', () => {
           'GET', server2 + billingAccountBalancePathA).body.toString('utf-8')).result;
       assert.deepEqual(
         billingAccountBalanceAfter,
-        billingAccountBalanceBefore - (gasPrice * MICRO_AIN * txRes.result.gas_amount_total.service)
+        billingAccountBalanceBefore - (gasPrice * MICRO_AIN * txRes.result.gas_amount_charged)
       );
     });
 
@@ -6089,7 +6877,10 @@ describe('Blockchain Node', () => {
         'GET',
         `${server2}/get_value?ref=/gas_fee/collect/${billingUserA}/${tx.number}/${txRes.tx_hash}/amount`
       ).body.toString('utf-8')).result;
-      assert.deepEqual(gasFeeCollected, gasPrice * MICRO_AIN * txRes.result.gas_amount_total.service);
+      assert.deepEqual(
+        gasFeeCollected,
+        gasPrice * MICRO_AIN * txRes.result.gas_amount_charged
+      );
     });
 
     it('multi-set service tx: billing account', async () => {
@@ -6122,7 +6913,7 @@ describe('Blockchain Node', () => {
           'GET', server2 + billingAccountBalancePathA).body.toString('utf-8')).result;
       assert.deepEqual(
         billingAccountBalanceAfter,
-        billingAccountBalanceBefore - (gasPrice * MICRO_AIN * txRes.result.gas_amount_total.service)
+        billingAccountBalanceBefore - (gasPrice * MICRO_AIN * txRes.result.gas_amount_charged)
       );
     });
 
@@ -6181,10 +6972,123 @@ describe('Blockchain Node', () => {
         }
       }).body.toString('utf-8'));
       assert.deepEqual(txResBody.result.result, {
-        "error_message": "Failed to collect gas fee: Multiple app-dependent service operations for a billing account",
-        "code": 16,
-        "gas_amount": 0
+        "bandwidth_gas_amount": 0,
+        "error_message": "[precheckTxBillingParams] Multiple app-dependent service operations for a billing account",
+        "code": 16
       });
     });
   });
+
+  describe('Tx Receipts', () => {
+    it(`records a transaction's receipt`, async () => {
+      const txSignerAddress = parseOrLog(syncRequest(
+          'GET', server1 + '/get_address').body.toString('utf-8')).result;
+      const request = {
+        ref: '/apps/test/test_value/some/path',
+        value: "some value"
+      };
+      const body = parseOrLog(syncRequest(
+          'POST', server1 + '/set_value', {json: request}).body.toString('utf-8'));
+      assert.deepEqual(_.get(body, 'result.result.code'), 0);
+      expect(_.get(body, 'result.tx_hash')).to.not.equal(null);
+      expect(body.code).to.equal(0);
+      if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+        console.error(`Failed to check finalization of tx.`);
+      }
+
+      const receipt = parseOrLog(syncRequest(
+          'GET', server1 + `/get_value?ref=/receipts/${body.result.tx_hash}`)
+          .body.toString('utf-8')).result;
+      assert.deepEqual(receipt.address, txSignerAddress);
+      assert.deepEqual(receipt.exec_result, {
+        bandwidth_gas_amount: 1,
+        code: 0,
+        gas_amount_charged: 0,
+        gas_amount_total: {
+          bandwidth: {
+            app: {
+              test: 1
+            },
+            service: 0
+          },
+          state: {
+            app: {
+              test: 188
+            },
+            service: 0
+          },
+        },
+        gas_cost_total: 0
+      });
+    });
+
+    it(`removes an old transaction's receipt`, async () => {
+      const MAX_BLOCK_NUMBERS_FOR_RECEIPTS = 100;
+      let lastBlockNumber = getLastBlockNumber(server1);
+      if (lastBlockNumber <= MAX_BLOCK_NUMBERS_FOR_RECEIPTS) {
+        await waitForNewBlocks(server1, MAX_BLOCK_NUMBERS_FOR_RECEIPTS - lastBlockNumber + 1);
+        lastBlockNumber = getLastBlockNumber(server1);
+      }
+      let oldBlockNumber = lastBlockNumber - MAX_BLOCK_NUMBERS_FOR_RECEIPTS;
+      let oldBlock = getBlockByNumber(server1, oldBlockNumber);
+      while (!oldBlock.transactions.length) {
+        oldBlock = getBlockByNumber(server1, --oldBlockNumber);
+        await CommonUtil.sleep(2000);
+      }
+      for (const tx of oldBlock.transactions) {
+        const receipt = parseOrLog(syncRequest(
+          'GET', server1 + `/get_value?ref=/receipts/${tx.hash}`)
+          .body.toString('utf-8')).result;
+        assert.deepEqual(receipt, null);
+      }
+    });
+
+    it('failed transaction', async () => {
+      const server1Address = parseOrLog(syncRequest(
+        'GET', server1 + '/get_address').body.toString('utf-8')).result;
+      const server2Address = parseOrLog(syncRequest(
+        'GET', server2 + '/get_address').body.toString('utf-8')).result;
+      const failingTx = {
+        ref: `/transfer/${server1Address}/${server2Address}/${Date.now()}/value`,
+        value: 10000000000,
+        gas_price: 1
+      }
+      const body = parseOrLog(syncRequest(
+        'POST', server1 + '/set_value', {json: failingTx}).body.toString('utf-8'));
+      assert.deepEqual(body.result.result.code, 103);
+      assert.deepEqual(body.result.result.bandwidth_gas_amount, 1);
+      assert.deepEqual(body.result.result.gas_amount_total, {
+        "bandwidth": {
+          "service": 1
+        },
+        "state": {
+          "service": 0
+        }
+      });
+      assert.deepEqual(body.result.result.gas_cost_total, 0.000001);
+      
+      if (!(await waitUntilTxFinalized(serverList, _.get(body, 'result.tx_hash')))) {
+        console.error(`Failed to check finalization of tx.`);
+      }
+
+      // Failed tx's receipt is in state
+      const txHash = body.result.tx_hash;
+      const receipt = parseOrLog(syncRequest(
+        'GET', server2 + `/get_value?ref=/receipts/${txHash}`).body.toString('utf-8')).result;
+      expect(receipt).to.not.equal(null);
+      assert.deepEqual(receipt.exec_result, body.result.result);
+
+      // Failed tx's gas fees have been collected
+      const blockNumber = receipt.block_number;
+      const gasFeeCollected = parseOrLog(syncRequest(
+        'GET', server2 + `/get_value?ref=/gas_fee/collect/${server1Address}/${blockNumber}/${txHash}/amount`
+      ).body.toString('utf-8')).result;
+      assert.deepEqual(gasFeeCollected, body.result.result.gas_cost_total);
+
+      // Failed tx is in a block
+      const block = getBlockByNumber(server2, blockNumber);
+      expect(block).to.not.equal(undefined);
+      expect(block.transactions.find((tx) => tx.hash === txHash)).to.not.equal(undefined);
+    });
+  });
 });
diff --git a/integration/sharding.test.js b/integration/sharding.test.js
index 279052182..5a92a546a 100644
--- a/integration/sharding.test.js
+++ b/integration/sharding.test.js
@@ -32,6 +32,7 @@ const {
   waitForNewBlocks,
   waitUntilNodeSyncs,
   waitUntilTxFinalized,
+  setUpApp,
 } = require('../unittest/test-util');
 
 const ENV_VARIABLES = [
@@ -86,6 +87,7 @@ const server2 = 'http://localhost:' + String(9091 + Number(ENV_VARIABLES[3].ACCO
 const server3 = 'http://localhost:' + String(9091 + Number(ENV_VARIABLES[4].ACCOUNT_INDEX))
 const server4 = 'http://localhost:' + String(9091 + Number(ENV_VARIABLES[5].ACCOUNT_INDEX))
 const shardServerList = [ server1, server2, server3, server4 ];
+const account = ainUtil.createAccount();
 
 function startServer(application, serverName, envVars, stdioInherit = false) {
   const options = {
@@ -116,24 +118,26 @@ async function waitUntilShardReporterStarts() {
 }
 
 async function setUp() {
-  let res = parseOrLog(syncRequest('POST', server2 + '/set', {
+  const res = parseOrLog(syncRequest('POST', server2 + '/set', {
     json: {
       op_list: [
         {
           type: 'SET_VALUE',
-          ref: 'test/test_value/some/path',
+          ref: '/apps/test/test_value/some/path',
           value: 100
         },
         {
           type: 'SET_RULE',
-          ref: '/test/test_rule/some/path',
+          ref: '/apps/test/test_rule/some/path',
           value: {
-            ".write": "auth.addr === 'abcd'"
+            ".rule": {
+              "write": "auth.addr === 'abcd'"
+            }
           }
         },
         {
           type: 'SET_FUNCTION',
-          ref: '/test/test_function/some/path',
+          ref: '/apps/test/test_function/some/path',
           value: {
             ".function": {
               "fid": {
@@ -147,7 +151,7 @@ async function setUp() {
         },
         {
           type: 'SET_OWNER',
-          ref: '/test/test_owner/some/path',
+          ref: '/apps/test/test_owner/some/path',
           value: {
             ".owner": {
               "owners": {
@@ -176,22 +180,22 @@ async function cleanUp() {
       op_list: [
         {
           type: 'SET_VALUE',
-          ref: 'test/test_value/some/path',
+          ref: '/apps/test/test_value/some/path',
           value: null
         },
         {
           type: 'SET_RULE',
-          ref: '/test/test_rule/some/path',
+          ref: '/apps/test/test_rule/some/path',
           value: null
         },
         {
           type: 'SET_FUNCTION',
-          ref: '/test/test_function/some/path',
+          ref: '/apps/test/test_function/some/path',
           value: null
         },
         {
           type: 'SET_OWNER',
-          ref: '/test/test_owner/some/path',
+          ref: '/apps/test/test_owner/some/path',
           value: null
         },
       ],
@@ -247,28 +251,7 @@ describe('Sharding', async () => {
     ).result;
     await waitUntilTxFinalized(parentServerList, shardReportRes.tx_hash);
     // Create app at the parent chain for the shard
-    const appStakingRes = parseOrLog(syncRequest('POST', parentServer + '/set_value', {
-      json: {
-        ref: `/staking/afan/${parentServerAddr}/0/stake/${Date.now()}/value`,
-        value: 1
-      }
-    }).body.toString('utf-8')).result;
-    assert.deepEqual(CommonUtil.isFailedTx(_.get(appStakingRes, 'result')), false);
-    if (!(await waitUntilTxFinalized(parentServerList, appStakingRes.tx_hash))) {
-      console.log(`Failed to check finalization of app staking tx.`);
-    }
-    const createAppRes = parseOrLog(syncRequest('POST', parentServer + '/set_value', {
-      json: {
-        ref: `/manage_app/afan/create/${Date.now()}`,
-        value: {
-          admin: { [shardOwnerAddr]: true }
-        }
-      }
-    }).body.toString('utf-8')).result;
-    assert.deepEqual(CommonUtil.isFailedTx(_.get(createAppRes, 'result')), false);
-    if (!(await waitUntilTxFinalized(parentServerList, createAppRes.tx_hash))) {
-      console.log(`Failed to check finalization of create app tx.`);
-    }
+    await setUpApp('afan', parentServerList, { admin: { [shardOwnerAddr]: true } });
     
     tracker_proc = startServer(TRACKER_SERVER, 'tracker server', ENV_VARIABLES[1], true);
     await CommonUtil.sleep(2000);
@@ -362,7 +345,7 @@ describe('Sharding', async () => {
             `.shard/proof_hash_map/$block_number/proof_hash`)
           .body.toString('utf-8'));
         expect(body.code).to.equal(0);
-        expect(body.result['.write']).to.have.string(shardReporterAddr);
+        expect(body.result['.rule']['write']).to.have.string(shardReporterAddr);
       });
     });
 
@@ -378,6 +361,10 @@ describe('Sharding', async () => {
   });
 
   describe('Child chain initialization', () => {
+    before(async () => {
+      await setUpApp('afan', shardServerList, { admin: { [shardOwnerAddr]: true } });
+    });
+    
     describe('DB values', () => {
       it('token', () => {
         const body = parseOrLog(syncRequest('GET', server1 + '/get_value?ref=/token')
@@ -422,7 +409,7 @@ describe('Sharding', async () => {
         const body = parseOrLog(syncRequest('GET', server3 + '/get_rule?ref=/sharding/config')
           .body.toString('utf-8'));
         expect(body.code).to.equal(0);
-        expect(body.result['.write']).to.have.string(shardOwnerAddr);
+        expect(body.result['.rule']['write']).to.have.string(shardOwnerAddr);
       })
     })
 
@@ -502,6 +489,21 @@ describe('Sharding', async () => {
   describe('API Tests', () => {
     describe('Get API', () => {
       before(async () => {
+        const server1Addr = parseOrLog(syncRequest(
+            'GET', server1 + '/get_address').body.toString('utf-8')).result;
+        const server2Addr = parseOrLog(syncRequest(
+            'GET', server2 + '/get_address').body.toString('utf-8')).result;
+        const server3Addr = parseOrLog(syncRequest(
+            'GET', server3 + '/get_address').body.toString('utf-8')).result;
+        const server4Addr = parseOrLog(syncRequest(
+            'GET', server4 + '/get_address').body.toString('utf-8')).result;
+        await setUpApp('test', shardServerList, { admin: {
+          [account.address]: true,
+          [server1Addr]: true,
+          [server2Addr]: true,
+          [server3Addr]: true,
+          [server4Addr]: true
+        } });
         await setUp();
       })
 
@@ -512,7 +514,7 @@ describe('Sharding', async () => {
       describe('/get_value', () => {
         it('/get_value with is_global = false', () => {
           const body = parseOrLog(
-              syncRequest('GET', server1 + '/get_value?ref=/test/test_value/some/path')
+              syncRequest('GET', server1 + '/get_value?ref=/apps/test/test_value/some/path')
             .body.toString('utf-8'));
           assert.deepEqual(body.code, 0);
           assert.deepEqual(body.result, 100);
@@ -520,7 +522,7 @@ describe('Sharding', async () => {
 
         it('/get_value with is_global = false (explicit)', () => {
           const body = parseOrLog(syncRequest(
-              'GET', server1 + '/get_value?ref=/test/test_value/some/path&is_global=false')
+              'GET', server1 + '/get_value?ref=/apps/test/test_value/some/path&is_global=false')
             .body.toString('utf-8'));
           assert.deepEqual(body.code, 0);
           assert.deepEqual(body.result, 100);
@@ -528,7 +530,7 @@ describe('Sharding', async () => {
 
         it('/get_value with is_global = true', () => {
           const body = parseOrLog(syncRequest(
-              'GET', server1 + '/get_value?ref=/apps/afan/test/test_value/some/path&is_global=true')
+              'GET', server1 + '/get_value?ref=/apps/afan/apps/test/test_value/some/path&is_global=true')
             .body.toString('utf-8'));
           assert.deepEqual(body.code, 0);
           assert.deepEqual(body.result, 100);
@@ -538,7 +540,7 @@ describe('Sharding', async () => {
       describe('/get_function', () => {
         it('/get_function with is_global = false', () => {
           const body = parseOrLog(
-              syncRequest('GET', server1 + '/get_function?ref=/test/test_function/some/path')
+              syncRequest('GET', server1 + '/get_function?ref=/apps/test/test_function/some/path')
             .body.toString('utf-8'));
           assert.deepEqual(body.code, 0);
           assert.deepEqual(body.result, {
@@ -555,7 +557,7 @@ describe('Sharding', async () => {
 
         it('/get_function with is_global = true', () => {
           const body = parseOrLog(syncRequest(
-              'GET', server1 + '/get_function?ref=/apps/afan/test/test_function/some/path&is_global=true')
+              'GET', server1 + '/get_function?ref=/apps/afan/apps/test/test_function/some/path&is_global=true')
             .body.toString('utf-8'));
           assert.deepEqual(body.code, 0);
           assert.deepEqual(body.result, {
@@ -574,25 +576,33 @@ describe('Sharding', async () => {
       describe('/get_rule', () => {
         it('/get_rule with is_global = false', () => {
           const body = parseOrLog(
-              syncRequest('GET', server1 + '/get_rule?ref=/test/test_rule/some/path')
+              syncRequest('GET', server1 + '/get_rule?ref=/apps/test/test_rule/some/path')
             .body.toString('utf-8'));
           assert.deepEqual(body.code, 0);
-          assert.deepEqual(body.result, { '.write': 'auth.addr === \'abcd\'' });
+          assert.deepEqual(body.result, {
+            '.rule': {
+              'write': 'auth.addr === \'abcd\''
+            }
+          });
         })
 
         it('/get_rule with is_global = true', () => {
           const body = parseOrLog(syncRequest(
-              'GET', server1 + '/get_rule?ref=/apps/afan/test/test_rule/some/path&is_global=true')
+              'GET', server1 + '/get_rule?ref=/apps/afan/apps/test/test_rule/some/path&is_global=true')
             .body.toString('utf-8'));
           assert.deepEqual(body.code, 0);
-          assert.deepEqual(body.result, { '.write': 'auth.addr === \'abcd\'' });
+          assert.deepEqual(body.result, {
+            '.rule': {
+              'write': 'auth.addr === \'abcd\''
+            }
+          });
         })
       })
 
       describe('/get_owner', () => {
         it('/get_owner with is_global = false', () => {
           const body = parseOrLog(
-              syncRequest('GET', server1 + '/get_owner?ref=/test/test_owner/some/path')
+              syncRequest('GET', server1 + '/get_owner?ref=/apps/test/test_owner/some/path')
             .body.toString('utf-8'));
           assert.deepEqual(body.code, 0);
           assert.deepEqual(body.result, {
@@ -611,7 +621,7 @@ describe('Sharding', async () => {
 
         it('/get_owner with is_global = true', () => {
           const body = parseOrLog(syncRequest(
-              'GET', server1 + '/get_owner?ref=/apps/afan/test/test_owner/some/path&is_global=true')
+              'GET', server1 + '/get_owner?ref=/apps/afan/apps/test/test_owner/some/path&is_global=true')
             .body.toString('utf-8'));
           assert.deepEqual(body.code, 0);
           assert.deepEqual(body.result, {
@@ -631,13 +641,13 @@ describe('Sharding', async () => {
 
       describe('/match_function', () => {
         it('/match_function with is_global = false', () => {
-          const ref = "/test/test_function/some/path";
+          const ref = "/apps/test/test_function/some/path";
           const body = parseOrLog(syncRequest('GET', `${server1}/match_function?ref=${ref}`)
             .body.toString('utf-8'));
           assert.deepEqual(body, {code: 0, result: {
             "matched_path": {
-              "target_path": "/test/test_function/some/path",
-              "ref_path": "/test/test_function/some/path",
+              "target_path": "/apps/test/test_function/some/path",
+              "ref_path": "/apps/test/test_function/some/path",
               "path_vars": {},
             },
             "matched_config": {
@@ -649,21 +659,21 @@ describe('Sharding', async () => {
                   "service_name": "https://ainetwork.ai"
                 }
               },
-              "path": "/test/test_function/some/path"
+              "path": "/apps/test/test_function/some/path"
             },
             "subtree_configs": []
           }});
         })
 
         it('/match_function with is_global = true', () => {
-          const ref = "/apps/afan/test/test_function/some/path";
+          const ref = "/apps/afan/apps/test/test_function/some/path";
           const body =
               parseOrLog(syncRequest('GET', `${server1}/match_function?ref=${ref}&is_global=true`)
             .body.toString('utf-8'));
           assert.deepEqual(body, {code: 0, result: {
             "matched_path": {
-              "target_path": "/apps/afan/test/test_function/some/path",
-              "ref_path": "/apps/afan/test/test_function/some/path",
+              "target_path": "/apps/afan/apps/test/test_function/some/path",
+              "ref_path": "/apps/afan/apps/test/test_function/some/path",
               "path_vars": {},
             },
             "matched_config": {
@@ -675,7 +685,7 @@ describe('Sharding', async () => {
                   "service_name": "https://ainetwork.ai"
                 }
               },
-              "path": "/apps/afan/test/test_function/some/path"
+              "path": "/apps/afan/apps/test/test_function/some/path"
             },
             "subtree_configs": []
           }});
@@ -684,37 +694,41 @@ describe('Sharding', async () => {
 
       describe('/match_rule', () => {
         it('/match_rule with is_global = false', () => {
-          const ref = "/test/test_rule/some/path";
+          const ref = "/apps/test/test_rule/some/path";
           const body = parseOrLog(syncRequest('GET', `${server1}/match_rule?ref=${ref}`)
             .body.toString('utf-8'));
           assert.deepEqual(body, {code: 0, result: {
             "matched_path": {
-              "target_path": "/test/test_rule/some/path",
-              "ref_path": "/test/test_rule/some/path",
+              "target_path": "/apps/test/test_rule/some/path",
+              "ref_path": "/apps/test/test_rule/some/path",
               "path_vars": {},
             },
             "matched_config": {
-              "config": "auth.addr === 'abcd'",
-              "path": "/test/test_rule/some/path"
+              "config": {
+                "write": "auth.addr === 'abcd'"
+              },
+              "path": "/apps/test/test_rule/some/path"
             },
             "subtree_configs": []
           }});
         })
 
         it('/match_rule with is_global = true', () => {
-          const ref = "/apps/afan/test/test_rule/some/path";
+          const ref = "/apps/afan/apps/test/test_rule/some/path";
           const body =
               parseOrLog(syncRequest('GET', `${server1}/match_rule?ref=${ref}&is_global=true`)
             .body.toString('utf-8'));
           assert.deepEqual(body, {code: 0, result: {
             "matched_path": {
-              "target_path": "/apps/afan/test/test_rule/some/path",
-              "ref_path": "/apps/afan/test/test_rule/some/path",
+              "target_path": "/apps/afan/apps/test/test_rule/some/path",
+              "ref_path": "/apps/afan/apps/test/test_rule/some/path",
               "path_vars": {},
             },
             "matched_config": {
-              "config": "auth.addr === 'abcd'",
-              "path": "/apps/afan/test/test_rule/some/path"
+              "config": {
+                "write": "auth.addr === 'abcd'"
+              },
+              "path": "/apps/afan/apps/test/test_rule/some/path"
             },
             "subtree_configs": []
           }});
@@ -723,12 +737,12 @@ describe('Sharding', async () => {
 
       describe('/match_owner', () => {
         it('/match_owner with is_global = false', () => {
-          const ref = "/test/test_owner/some/path";
+          const ref = "/apps/test/test_owner/some/path";
           const body = parseOrLog(syncRequest('GET', `${server1}/match_owner?ref=${ref}`)
               .body.toString('utf-8'));
           assert.deepEqual(body, {code: 0, result: {
             "matched_path": {
-              "target_path": "/test/test_owner/some/path"
+              "target_path": "/apps/test/test_owner/some/path"
             },
             "matched_config": {
               "config": {
@@ -741,19 +755,19 @@ describe('Sharding', async () => {
                   }
                 }
               },
-              "path": "/test/test_owner/some/path"
+              "path": "/apps/test/test_owner/some/path"
             }
           }});
         })
 
         it('/match_owner with is_global = true', () => {
-          const ref = "/apps/afan/test/test_owner/some/path";
+          const ref = "/apps/afan/apps/test/test_owner/some/path";
           const body =
               parseOrLog(syncRequest('GET', `${server1}/match_owner?ref=${ref}&is_global=true`)
               .body.toString('utf-8'));
           assert.deepEqual(body, {code: 0, result: {
             "matched_path": {
-              "target_path": "/apps/afan/test/test_owner/some/path"
+              "target_path": "/apps/afan/apps/test/test_owner/some/path"
             },
             "matched_config": {
               "config": {
@@ -766,7 +780,7 @@ describe('Sharding', async () => {
                   }
                 }
               },
-              "path": "/apps/afan/test/test_owner/some/path"
+              "path": "/apps/afan/apps/test/test_owner/some/path"
             }
           }});
         })
@@ -774,7 +788,7 @@ describe('Sharding', async () => {
 
       describe('/eval_rule', () => {
         it('/eval_rule with is_global = false', () => {
-          const ref = "/test/test_rule/some/path";
+          const ref = "/apps/test/test_rule/some/path";
           const value = "value";
           const address = "abcd";
           const request = { ref, value, address, protoVer: CURRENT_PROTOCOL_VERSION };
@@ -784,7 +798,7 @@ describe('Sharding', async () => {
         })
 
         it('/eval_rule with is_global = true', () => {
-          const ref = "/apps/afan/test/test_rule/some/path";
+          const ref = "/apps/afan/apps/test/test_rule/some/path";
           const value = "value";
           const address = "abcd";
           const is_global = true;
@@ -797,7 +811,7 @@ describe('Sharding', async () => {
 
       describe('/eval_owner', () => {
         it('/eval_owner with is_global = false', () => {
-          const ref = "/test/test_owner/some/path";
+          const ref = "/apps/test/test_owner/some/path";
           const address = "abcd";
           const permission = "write_owner";
           const request = { ref, permission, address, protoVer: CURRENT_PROTOCOL_VERSION };
@@ -810,7 +824,7 @@ describe('Sharding', async () => {
         })
 
         it('/eval_owner with is_global = true', () => {
-          const ref = "/apps/afan/test/test_owner/some/path";
+          const ref = "/apps/afan/apps/test/test_owner/some/path";
           const address = "abcd";
           const permission = "write_owner";
           const is_global = true;
@@ -831,29 +845,29 @@ describe('Sharding', async () => {
             op_list: [
               {
                 type: "GET_VALUE",
-                ref: "/test/test_value/some/path",
+                ref: "/apps/test/test_value/some/path",
               },
               {
                 type: 'GET_FUNCTION',
-                ref: "/test/test_function/some/path",
+                ref: "/apps/test/test_function/some/path",
               },
               {
                 type: 'GET_RULE',
-                ref: "/test/test_rule/some/path",
+                ref: "/apps/test/test_rule/some/path",
               },
               {
                 type: 'GET_OWNER',
-                ref: "/test/test_owner/some/path",
+                ref: "/apps/test/test_owner/some/path",
               },
               {
                 type: 'EVAL_RULE',
-                ref: "/test/test_rule/some/path",
+                ref: "/apps/test/test_rule/some/path",
                 value: "value",
                 address: "abcd"
               },
               {
                 type: 'EVAL_OWNER',
-                ref: "/test/test_owner/some/path",
+                ref: "/apps/test/test_owner/some/path",
                 permission: "write_owner",
                 address: "abcd"
               }
@@ -876,7 +890,9 @@ describe('Sharding', async () => {
                 }
               },
               {
-                ".write": "auth.addr === 'abcd'"
+                ".rule": {
+                  "write": "auth.addr === 'abcd'"
+                }
               },
               {
                 ".owner": {
@@ -901,34 +917,34 @@ describe('Sharding', async () => {
             op_list: [
               {
                 type: "GET_VALUE",
-                ref: "/apps/afan/test/test_value/some/path",
+                ref: "/apps/afan/apps/test/test_value/some/path",
                 is_global: true,
               },
               {
                 type: 'GET_FUNCTION',
-                ref: "/apps/afan/test/test_function/some/path",
+                ref: "/apps/afan/apps/test/test_function/some/path",
                 is_global: true,
               },
               {
                 type: 'GET_RULE',
-                ref: "/apps/afan/test/test_rule/some/path",
+                ref: "/apps/afan/apps/test/test_rule/some/path",
                 is_global: true,
               },
               {
                 type: 'GET_OWNER',
-                ref: "/apps/afan/test/test_owner/some/path",
+                ref: "/apps/afan/apps/test/test_owner/some/path",
                 is_global: true,
               },
               {
                 type: 'EVAL_RULE',
-                ref: "/apps/afan/test/test_rule/some/path",
+                ref: "/apps/afan/apps/test/test_rule/some/path",
                 value: "value",
                 address: "abcd",
                 is_global: true,
               },
               {
                 type: 'EVAL_OWNER',
-                ref: "/apps/afan/test/test_owner/some/path",
+                ref: "/apps/afan/apps/test/test_owner/some/path",
                 permission: "write_owner",
                 address: "abcd",
                 is_global: true,
@@ -952,7 +968,9 @@ describe('Sharding', async () => {
                 }
               },
               {
-                ".write": "auth.addr === 'abcd'"
+                ".rule": {
+                  "write": "auth.addr === 'abcd'"
+                }
               },
               {
                 ".owner": {
@@ -980,7 +998,7 @@ describe('Sharding', async () => {
           return jsonRpcClient.request('ain_get', {
             protoVer: CURRENT_PROTOCOL_VERSION,
             type: 'GET_VALUE',
-            ref: "/test/test_value/some/path"
+            ref: "/apps/test/test_value/some/path"
           })
           .then(res => {
             expect(res.result.result).to.equal(expected);
@@ -993,7 +1011,7 @@ describe('Sharding', async () => {
           return jsonRpcClient.request('ain_get', {
             protoVer: CURRENT_PROTOCOL_VERSION,
             type: 'GET_VALUE',
-            ref: "/test/test_value/some/path",
+            ref: "/apps/test/test_value/some/path",
             is_global: false,
           })
           .then(res => {
@@ -1007,7 +1025,7 @@ describe('Sharding', async () => {
           return jsonRpcClient.request('ain_get', {
             protoVer: CURRENT_PROTOCOL_VERSION,
             type: 'GET_VALUE',
-            ref: "/apps/afan/test/test_value/some/path",
+            ref: "/apps/afan/apps/test/test_value/some/path",
             is_global: true,
           })
           .then(res => {
@@ -1018,14 +1036,14 @@ describe('Sharding', async () => {
 
       describe('ain_matchFunction', () => {
         it('ain_matchFunction with is_global = false', () => {
-          const ref = "/test/test_function/some/path";
+          const ref = "/apps/test/test_function/some/path";
           const request = { ref, protoVer: CURRENT_PROTOCOL_VERSION };
           return jayson.client.http(server1 + '/json-rpc').request('ain_matchFunction', request)
           .then(res => {
             assert.deepEqual(res.result.result, {
               "matched_path": {
-                "target_path": "/test/test_function/some/path",
-                "ref_path": "/test/test_function/some/path",
+                "target_path": "/apps/test/test_function/some/path",
+                "ref_path": "/apps/test/test_function/some/path",
                 "path_vars": {},
               },
               "matched_config": {
@@ -1037,7 +1055,7 @@ describe('Sharding', async () => {
                     "service_name": "https://ainetwork.ai"
                   }
                 },
-                "path": "/test/test_function/some/path"
+                "path": "/apps/test/test_function/some/path"
               },
               "subtree_configs": []
             });
@@ -1045,14 +1063,14 @@ describe('Sharding', async () => {
         })
 
         it('ain_matchFunction with is_global = true', () => {
-          const ref = "/apps/afan/test/test_function/some/path";
+          const ref = "/apps/afan/apps/test/test_function/some/path";
           const request = { ref, is_global: true, protoVer: CURRENT_PROTOCOL_VERSION };
           return jayson.client.http(server1 + '/json-rpc').request('ain_matchFunction', request)
           .then(res => {
             assert.deepEqual(res.result.result, {
               "matched_path": {
-                "target_path": "/apps/afan/test/test_function/some/path",
-                "ref_path": "/apps/afan/test/test_function/some/path",
+                "target_path": "/apps/afan/apps/test/test_function/some/path",
+                "ref_path": "/apps/afan/apps/test/test_function/some/path",
                 "path_vars": {},
               },
               "matched_config": {
@@ -1064,7 +1082,7 @@ describe('Sharding', async () => {
                     "service_name": "https://ainetwork.ai"
                   }
                 },
-                "path": "/apps/afan/test/test_function/some/path"
+                "path": "/apps/afan/apps/test/test_function/some/path"
               },
               "subtree_configs": []
             });
@@ -1074,19 +1092,21 @@ describe('Sharding', async () => {
 
       describe('ain_matchRule', () => {
         it('ain_matchRule with is_global = false', () => {
-          const ref = "/test/test_rule/some/path";
+          const ref = "/apps/test/test_rule/some/path";
           const request = { ref, protoVer: CURRENT_PROTOCOL_VERSION };
           return jayson.client.http(server1 + '/json-rpc').request('ain_matchRule', request)
           .then(res => {
             assert.deepEqual(res.result.result, {
               "matched_path": {
-                "target_path": "/test/test_rule/some/path",
-                "ref_path": "/test/test_rule/some/path",
+                "target_path": "/apps/test/test_rule/some/path",
+                "ref_path": "/apps/test/test_rule/some/path",
                 "path_vars": {},
               },
               "matched_config": {
-                "config": "auth.addr === 'abcd'",
-                "path": "/test/test_rule/some/path"
+                "config": {
+                  "write": "auth.addr === 'abcd'"
+                },
+                "path": "/apps/test/test_rule/some/path"
               },
               "subtree_configs": []
             });
@@ -1094,19 +1114,21 @@ describe('Sharding', async () => {
         })
 
         it('ain_matchRule with is_global = true', () => {
-          const ref = "/apps/afan/test/test_rule/some/path";
+          const ref = "/apps/afan/apps/test/test_rule/some/path";
           const request = { ref, is_global: true, protoVer: CURRENT_PROTOCOL_VERSION };
           return jayson.client.http(server1 + '/json-rpc').request('ain_matchRule', request)
           .then(res => {
             assert.deepEqual(res.result.result, {
               "matched_path": {
-                "target_path": "/apps/afan/test/test_rule/some/path",
-                "ref_path": "/apps/afan/test/test_rule/some/path",
+                "target_path": "/apps/afan/apps/test/test_rule/some/path",
+                "ref_path": "/apps/afan/apps/test/test_rule/some/path",
                 "path_vars": {},
               },
               "matched_config": {
-                "config": "auth.addr === 'abcd'",
-                "path": "/apps/afan/test/test_rule/some/path"
+                "config": {
+                  "write": "auth.addr === 'abcd'"
+                },
+                "path": "/apps/afan/apps/test/test_rule/some/path"
               },
               "subtree_configs": []
             });
@@ -1116,13 +1138,13 @@ describe('Sharding', async () => {
 
       describe('ain_matchOwner', () => {
         it('ain_matchOwner with is_global = false', () => {
-          const ref = "/test/test_owner/some/path";
+          const ref = "/apps/test/test_owner/some/path";
           const request = { ref, protoVer: CURRENT_PROTOCOL_VERSION };
           return jayson.client.http(server1 + '/json-rpc').request('ain_matchOwner', request)
           .then(res => {
             assert.deepEqual(res.result.result, {
               "matched_path": {
-                "target_path": "/test/test_owner/some/path"
+                "target_path": "/apps/test/test_owner/some/path"
               },
               "matched_config": {
                 "config": {
@@ -1135,20 +1157,20 @@ describe('Sharding', async () => {
                     }
                   }
                 },
-                "path": "/test/test_owner/some/path"
+                "path": "/apps/test/test_owner/some/path"
               }
             });
           })
         })
 
         it('ain_matchOwner with is_global = true', () => {
-          const ref = "/apps/afan/test/test_owner/some/path";
+          const ref = "/apps/afan/apps/test/test_owner/some/path";
           const request = { ref, is_global: true, protoVer: CURRENT_PROTOCOL_VERSION };
           return jayson.client.http(server1 + '/json-rpc').request('ain_matchOwner', request)
           .then(res => {
             assert.deepEqual(res.result.result, {
               "matched_path": {
-                "target_path": "/apps/afan/test/test_owner/some/path"
+                "target_path": "/apps/afan/apps/test/test_owner/some/path"
               },
               "matched_config": {
                 "config": {
@@ -1161,7 +1183,7 @@ describe('Sharding', async () => {
                     }
                   }
                 },
-                "path": "/apps/afan/test/test_owner/some/path"
+                "path": "/apps/afan/apps/test/test_owner/some/path"
               }
             });
           })
@@ -1170,7 +1192,7 @@ describe('Sharding', async () => {
 
       describe('ain_evalRule', () => {
         it('ain_evalRule with is_global = false', () => {
-          const ref = "/test/test_rule/some/path";
+          const ref = "/apps/test/test_rule/some/path";
           const value = "value";
           const address = "abcd";
           const request = { ref, value, address, protoVer: CURRENT_PROTOCOL_VERSION };
@@ -1181,7 +1203,7 @@ describe('Sharding', async () => {
         })
 
         it('ain_evalRule with is_global = true', () => {
-          const ref = "/apps/afan/test/test_rule/some/path";
+          const ref = "/apps/afan/apps/test/test_rule/some/path";
           const value = "value";
           const address = "abcd";
           const request =
@@ -1195,7 +1217,7 @@ describe('Sharding', async () => {
 
       describe('ain_evalOwner', () => {
         it('ain_evalOwner with is_global = false', () => {
-          const ref = "/test/test_owner/some/path";
+          const ref = "/apps/test/test_owner/some/path";
           const address = "abcd";
           const permission = "write_owner";
           const request = { ref, permission, address, protoVer: CURRENT_PROTOCOL_VERSION };
@@ -1206,7 +1228,7 @@ describe('Sharding', async () => {
         })
 
         it('ain_evalOwner with is_global = true', () => {
-          const ref = "/apps/afan/test/test_owner/some/path";
+          const ref = "/apps/afan/apps/test/test_owner/some/path";
           const address = "abcd";
           const permission = "write_owner";
           const request =
@@ -1232,11 +1254,11 @@ describe('Sharding', async () => {
         it('/set_value with is_global = false', () => {
           // Check the original value.
           const resultBefore = parseOrLog(syncRequest(
-              'GET', server1 + '/get_value?ref=test/test_value/some/path')
+              'GET', server1 + '/get_value?ref=/apps/test/test_value/some/path')
               .body.toString('utf-8')).result;
           assert.deepEqual(resultBefore, 100);
 
-          const request = {ref: 'test/test_value/some/path', value: "some value", nonce: -1};
+          const request = {ref: '/apps/test/test_value/some/path', value: "some value", nonce: -1};
           const body = parseOrLog(syncRequest('POST', server1 + '/set_value', {json: request})
               .body.toString('utf-8'));
           assert.deepEqual(_.get(body, 'result.result.code'), 0);
@@ -1244,7 +1266,7 @@ describe('Sharding', async () => {
         })
 
         it('/set_value with is_global = false (explicit)', () => {
-          const request = {ref: 'test/test_value/some/path', value: "some value", is_global: false, nonce: -1};
+          const request = {ref: '/apps/test/test_value/some/path', value: "some value", is_global: false, nonce: -1};
           const body = parseOrLog(syncRequest('POST', server1 + '/set_value', {json: request})
               .body.toString('utf-8'));
           assert.deepEqual(_.get(body, 'result.result.code'), 0);
@@ -1253,7 +1275,7 @@ describe('Sharding', async () => {
 
         it('/set_value with is_global = true', () => {
           const request = {
-            ref: 'apps/afan/test/test_value/some/path', value: "some value", is_global: true, nonce: -1
+            ref: 'apps/afan/apps/test/test_value/some/path', value: "some value", is_global: true, nonce: -1
           };
           const body = parseOrLog(syncRequest('POST', server1 + '/set_value', {json: request})
               .body.toString('utf-8'));
@@ -1264,7 +1286,7 @@ describe('Sharding', async () => {
 
       describe('/inc_value', () => {
         it('/inc_value with is_global = false', () => {
-          const request = {ref: 'test/test_value/some/path', value: 10, nonce: -1};
+          const request = {ref: '/apps/test/test_value/some/path', value: 10, nonce: -1};
           const body = parseOrLog(syncRequest('POST', server1 + '/inc_value', {json: request})
               .body.toString('utf-8'));
           assert.deepEqual(_.get(body, 'result.result.code'), 0);
@@ -1273,7 +1295,7 @@ describe('Sharding', async () => {
 
         it('/inc_value with is_global = true', () => {
           const request = {
-            ref: 'apps/afan/test/test_value/some/path', value: 10, is_global: true, nonce: -1
+            ref: 'apps/afan/apps/test/test_value/some/path', value: 10, is_global: true, nonce: -1
           };
           const body = parseOrLog(syncRequest('POST', server1 + '/inc_value', {json: request})
               .body.toString('utf-8'));
@@ -1284,7 +1306,7 @@ describe('Sharding', async () => {
 
       describe('/dec_value', () => {
         it('/dec_value with is_global = false', () => {
-          const request = {ref: 'test/test_value/some/path', value: 10, nonce: -1};
+          const request = {ref: '/apps/test/test_value/some/path', value: 10, nonce: -1};
           const body = parseOrLog(syncRequest('POST', server1 + '/dec_value', {json: request})
               .body.toString('utf-8'));
           assert.deepEqual(_.get(body, 'result.result.code'), 0);
@@ -1293,7 +1315,7 @@ describe('Sharding', async () => {
 
         it('/dec_value with is_global = true', () => {
           const request = {
-            ref: 'apps/afan/test/test_value/some/path', value: 10, is_global: true, nonce: -1
+            ref: 'apps/afan/apps/test/test_value/some/path', value: 10, is_global: true, nonce: -1
           };
           const body = parseOrLog(syncRequest('POST', server1 + '/dec_value', {json: request})
               .body.toString('utf-8'));
@@ -1305,7 +1327,7 @@ describe('Sharding', async () => {
       describe('/set_function', () => {
         it('/set_function with is_global = false', () => {
           const request = {
-            ref: "test/test_function/other/path",
+            ref: "/apps/test/test_function/other/path",
             value: {
               ".function": {
                 "fid": {
@@ -1326,7 +1348,7 @@ describe('Sharding', async () => {
 
         it('/set_function with is_global = true', () => {
           const request = {
-            ref: "apps/afan/test/test_function/other/path",
+            ref: "apps/afan/apps/test/test_function/other/path",
             value: {
               ".function": {
                 "fid": {
@@ -1350,9 +1372,11 @@ describe('Sharding', async () => {
       describe('/set_rule', () => {
         it('/set_rule with is_global = false', () => {
           const request = {
-            ref: "test/test_rule/other/path",
+            ref: "/apps/test/test_rule/other/path",
             value: {
-              ".write": "some other rule config"
+              ".rule": {
+                "write": "some other rule config"
+              }
             },
             nonce: -1
           };
@@ -1364,9 +1388,11 @@ describe('Sharding', async () => {
 
         it('/set_rule with is_global = true', () => {
           const request = {
-            ref: "apps/afan/test/test_rule/other/path",
+            ref: "apps/afan/apps/test/test_rule/other/path",
             value: {
-              ".write": "some other rule config"
+              ".rule": {
+                "write": "some other rule config"
+              }
             },
             is_global: true,
             nonce: -1
@@ -1381,7 +1407,7 @@ describe('Sharding', async () => {
       describe('/set_owner', () => {
         it('/set_owner with is_global = false', () => {
           const request = {
-            ref: "test/test_owner/other/path",
+            ref: "/apps/test/test_owner/other/path",
             value: {
               ".owner": {
                 "owners": {
@@ -1404,7 +1430,7 @@ describe('Sharding', async () => {
 
         it('/set_owner with is_global = true', () => {
           const request = {
-            ref: "apps/afan/test/test_owner/other2/path",
+            ref: "apps/afan/apps/test/test_owner/other2/path",
             value: {
               ".owner": {
                 "owners": {
@@ -1433,22 +1459,22 @@ describe('Sharding', async () => {
             op_list: [
               {
                 // Default type: SET_VALUE
-                ref: "test/test_value/other3/path",
+                ref: "/apps/test/test_value/other3/path",
                 value: "some other3 value",
               },
               {
                 type: 'INC_VALUE',
-                ref: "test/test_value/some/path",
+                ref: "/apps/test/test_value/some/path",
                 value: 10
               },
               {
                 type: 'DEC_VALUE',
-                ref: "test/test_value/some/path2",
+                ref: "/apps/test/test_value/some/path2",
                 value: 10
               },
               {
                 type: 'SET_FUNCTION',
-                ref: "/test/test_function/other3/path",
+                ref: "/apps/test/test_function/other3/path",
                 value: {
                   ".function": {
                     "fid": {
@@ -1462,14 +1488,16 @@ describe('Sharding', async () => {
               },
               {
                 type: 'SET_RULE',
-                ref: "/test/test_rule/other3/path",
+                ref: "/apps/test/test_rule/other3/path",
                 value: {
-                  ".write": "some other3 rule config"
+                  ".rule": {
+                    "write": "some other3 rule config"
+                  }
                 }
               },
               {
                 type: 'SET_OWNER',
-                ref: "/test/test_owner/other3/path",
+                ref: "/apps/test/test_owner/other3/path",
                 value: {
                   ".owner": {
                     "owners": {
@@ -1489,35 +1517,46 @@ describe('Sharding', async () => {
           const body = parseOrLog(syncRequest('POST', server1 + '/set', {json: request})
               .body.toString('utf-8'));
           assert.deepEqual(_.get(body, 'result.result'), {
-            "result_list": [
-              {
+            "result_list": {
+              "0": {
                 "code": 0,
-                "gas_amount": 1
+                "bandwidth_gas_amount": 1
               },
-              {
+              "1": {
                 "code": 0,
-                "gas_amount": 1
+                "bandwidth_gas_amount": 1
               },
-              {
+              "2": {
                 "code": 0,
-                "gas_amount": 1
+                "bandwidth_gas_amount": 1
               },
-              {
+              "3": {
                 "code": 0,
-                "gas_amount": 1
+                "bandwidth_gas_amount": 1
               },
-              {
+              "4": {
                 "code": 0,
-                "gas_amount": 1
+                "bandwidth_gas_amount": 1
               },
-              {
+              "5": {
                 "code": 0,
-                "gas_amount": 1
+                "bandwidth_gas_amount": 1
               },
-            ],
+            },
+            "gas_amount_charged": 1548,
             "gas_amount_total": {
-              "app": {},
-              "service": 6
+              "bandwidth": {
+                "app": {
+                  "test": 6
+                },
+                "service": 0
+              },
+              "state": {
+                "app": {
+                  "test": 2874
+                },
+                "service": 1548
+              }
             },
             "gas_cost_total": 0
           });
@@ -1529,25 +1568,25 @@ describe('Sharding', async () => {
             op_list: [
               {
                 // Default type: SET_VALUE
-                ref: "test/test_value/other4/path",
+                ref: "/apps/test/test_value/other4/path",
                 value: "some other4 value",
                 is_global: true,
               },
               {
                 type: 'INC_VALUE',
-                ref: "test/test_value/some/path",
+                ref: "/apps/test/test_value/some/path",
                 value: 10,
                 is_global: true,
               },
               {
                 type: 'DEC_VALUE',
-                ref: "test/test_value/some/path4",
+                ref: "/apps/test/test_value/some/path4",
                 value: 10,
                 is_global: true,
               },
               {
                 type: 'SET_FUNCTION',
-                ref: "/test/test_function/other4/path",
+                ref: "/apps/test/test_function/other4/path",
                 value: {
                   ".function": {
                     "fid": {
@@ -1562,15 +1601,17 @@ describe('Sharding', async () => {
               },
               {
                 type: 'SET_RULE',
-                ref: "/test/test_rule/other4/path",
+                ref: "/apps/test/test_rule/other4/path",
                 value: {
-                  ".write": "some other4 rule config"
+                  ".rule": {
+                    "write": "some other4 rule config"
+                  }
                 },
                 is_global: true,
               },
               {
                 type: 'SET_OWNER',
-                ref: "/test/test_owner/other4/path",
+                ref: "/apps/test/test_owner/other4/path",
                 value: {
                   ".owner": {
                     "owners": {
@@ -1591,35 +1632,43 @@ describe('Sharding', async () => {
           const body = parseOrLog(syncRequest('POST', server1 + '/set', {json: request})
               .body.toString('utf-8'));
           assert.deepEqual(_.get(body, 'result.result'), {
-            "result_list": [
-              {
+            "result_list": {
+              "0": {
                 "code": 0,
-                "gas_amount": 0
+                "bandwidth_gas_amount": 1
               },
-              {
+              "1": {
                 "code": 0,
-                "gas_amount": 0
+                "bandwidth_gas_amount": 1
               },
-              {
+              "2": {
                 "code": 0,
-                "gas_amount": 0
+                "bandwidth_gas_amount": 1
               },
-              {
+              "3": {
                 "code": 0,
-                "gas_amount": 0
+                "bandwidth_gas_amount": 1
               },
-              {
+              "4": {
                 "code": 0,
-                "gas_amount": 0
+                "bandwidth_gas_amount": 1
               },
-              {
+              "5": {
                 "code": 0,
-                "gas_amount": 0
+                "bandwidth_gas_amount": 1
               },
-            ],
+            },
+            "gas_amount_charged": 0,
             "gas_amount_total": {
-              "app": {},
-              "service": 0
+              "bandwidth": {
+                "app": {
+                  "test": 6
+                },
+                "service": 0
+              },
+              "state": {
+                "service": 0
+              }
             },
             "gas_cost_total": 0
           });
@@ -1629,13 +1678,12 @@ describe('Sharding', async () => {
 
       describe('ain_sendSignedTransaction', () => {
         it('ain_sendSignedTransaction with is_global = false', () => {
-          const account = ainUtil.createAccount();
           const client = jayson.client.http(server1 + '/json-rpc');
           const txBody = {
             operation: {
               type: 'SET_VALUE',
               value: 'some other value',
-              ref: `test/test_value/some/path`
+              ref: `/apps/test/test_value/some/path`
             },
             timestamp: Date.now(),
             nonce: -1
@@ -1652,10 +1700,21 @@ describe('Sharding', async () => {
                 result: {
                   result: {
                     code: 0,
-                    gas_amount: 1,
+                    bandwidth_gas_amount: 1,
+                    gas_amount_charged: 0,
                     gas_amount_total: {
-                      app: {},
-                      service: 1
+                      bandwidth: {
+                        app: {
+                          test: 1
+                        },
+                        service: 0
+                      },
+                      state: {
+                        app: {
+                          test: 24
+                        },
+                        service: 0
+                      }
                     },
                     gas_cost_total: 0
                   },
@@ -1666,13 +1725,12 @@ describe('Sharding', async () => {
         })
 
         it('ain_sendSignedTransaction with is_global = false (explicit)', () => {
-          const account = ainUtil.createAccount();
           const client = jayson.client.http(server1 + '/json-rpc');
           const txBody = {
             operation: {
               type: 'SET_VALUE',
               value: 'some other value',
-              ref: `test/test_value/some/path`,
+              ref: `/apps/test/test_value/some/path`,
               is_global: false,
             },
             timestamp: Date.now(),
@@ -1690,10 +1748,21 @@ describe('Sharding', async () => {
                 result: {
                   result: {
                     code: 0,
-                    gas_amount: 1,
+                    bandwidth_gas_amount: 1,
+                    gas_amount_charged: 0,
                     gas_amount_total: {
-                      app: {},
-                      service: 1
+                      bandwidth: {
+                        app: {
+                          test: 1
+                        },
+                        service: 0
+                      },
+                      state: {
+                        app: {
+                          test: 24
+                        },
+                        service: 0
+                      }
                     },
                     gas_cost_total: 0
                   },
@@ -1704,13 +1773,12 @@ describe('Sharding', async () => {
         })
 
         it('ain_sendSignedTransaction with is_global = true', () => {
-          const account = ainUtil.createAccount();
           const client = jayson.client.http(server1 + '/json-rpc');
           const txBody = {
             operation: {
               type: 'SET_VALUE',
               value: 'some other value',
-              ref: `apps/afan/test/test_value/some/path`,
+              ref: `apps/afan/apps/test/test_value/some/path`,
               is_global: true,
             },
             timestamp: Date.now(),
@@ -1728,12 +1796,21 @@ describe('Sharding', async () => {
                 result: {
                   result: {
                     code: 0,
-                    gas_amount: 1,
+                    bandwidth_gas_amount: 1,
+                    gas_amount_charged: 0,
                     gas_amount_total: {
-                      app: {
-                        afan: 1
+                      bandwidth: {
+                        app: {
+                          afan: 1
+                        },
+                        service: 0
                       },
-                      service: 0
+                      state: {
+                        app: {
+                          test: 24
+                        },
+                        service: 0
+                      }
                     },
                     gas_cost_total: 0
                   },
@@ -1746,13 +1823,12 @@ describe('Sharding', async () => {
 
       describe('ain_sendSignedTransactionBatch', () => {
         it('ain_sendSignedTransactionBatch with is_global = false', () => {
-          const account = ainUtil.createAccount();
           const client = jayson.client.http(server1 + '/json-rpc');
           const txBody = {
             operation: {
               type: 'SET_VALUE',
               value: 'some other value',
-              ref: `test/test_value/some/path`
+              ref: `/apps/test/test_value/some/path`
             },
             timestamp: Date.now(),
             nonce: -1
@@ -1777,10 +1853,21 @@ describe('Sharding', async () => {
                 {
                   result: {
                     code: 0,
-                    gas_amount: 1,
+                    bandwidth_gas_amount: 1,
+                    gas_amount_charged: 0,
                     gas_amount_total: {
-                      app: {},
-                      service: 1
+                      bandwidth: {
+                        app: {
+                          test: 1
+                        },
+                        service: 0
+                      },
+                      state: {
+                        app: {
+                          test: 24
+                        },
+                        service: 0
+                      }
                     },
                     gas_cost_total: 0
                   },
@@ -1792,13 +1879,12 @@ describe('Sharding', async () => {
         })
 
         it('ain_sendSignedTransactionBatch with is_global = false (explicit)', () => {
-          const account = ainUtil.createAccount();
           const client = jayson.client.http(server1 + '/json-rpc');
           const txBody = {
             operation: {
               type: 'SET_VALUE',
               value: 'some other value',
-              ref: `test/test_value/some/path`,
+              ref: `/apps/test/test_value/some/path`,
               is_global: false,
             },
             timestamp: Date.now(),
@@ -1827,10 +1913,21 @@ describe('Sharding', async () => {
                 {
                   result: {
                     code: 0,
-                    gas_amount: 1,
+                    bandwidth_gas_amount: 1,
+                    gas_amount_charged: 0,
                     gas_amount_total: {
-                      app: {},
-                      service: 1
+                      bandwidth: {
+                        app: {
+                          test: 1
+                        },
+                        service: 0
+                      },
+                      state: {
+                        app: {
+                          test: 24
+                        },
+                        service: 0
+                      }
                     },
                     gas_cost_total: 0
                   },
@@ -1842,13 +1939,12 @@ describe('Sharding', async () => {
         })
 
         it('ain_sendSignedTransactionBatch with is_global = true', () => {
-          const account = ainUtil.createAccount();
           const client = jayson.client.http(server1 + '/json-rpc');
           const txBody = {
             operation: {
               type: 'SET_VALUE',
               value: 'some other value',
-              ref: `apps/afan/test/test_value/some/path`,
+              ref: `apps/afan/apps/test/test_value/some/path`,
               is_global: true,
             },
             timestamp: Date.now(),
@@ -1877,12 +1973,21 @@ describe('Sharding', async () => {
                 {
                   result: {
                     code: 0,
-                    gas_amount: 1,
+                    bandwidth_gas_amount: 1,
+                    gas_amount_charged: 0,
                     gas_amount_total: {
-                      app: {
-                        afan: 1
+                      bandwidth: {
+                        app: {
+                          afan: 1
+                        },
+                        service: 0
                       },
-                      service: 0,
+                      state: {
+                        app: {
+                          test: 24
+                        },
+                        service: 0
+                      }
                     },
                     gas_cost_total: 0
                   },
@@ -1920,29 +2025,9 @@ describe('Sharding', async () => {
 
     describe('_updateLatestShardReport', () => {
       before(async () => {
-        const { shard_owner, shard_reporter, sharding_path } = shardingConfig;
-        const appStakingRes = parseOrLog(syncRequest('POST', parentServer + '/set_value', {
-          json: {
-            ref: `/staking/a_dapp/${shard_owner}/0/stake/${Date.now()}/value`,
-            value: 1
-          }
-        }).body.toString('utf-8')).result;
-        assert.deepEqual(CommonUtil.isFailedTx(_.get(appStakingRes, 'result')), false);
-        if (!(await waitUntilTxFinalized(parentServerList, appStakingRes.tx_hash))) {
-          console.log(`Failed to check finalization of app staking tx.`)
-        }
-        const createAppRes = parseOrLog(syncRequest('POST', parentServer + '/set_value', {
-          json: {
-            ref: `/manage_app/a_dapp/create/${Date.now()}`,
-            value: {
-              admin: { [shard_owner]: true }
-            }
-          }
-        }).body.toString('utf-8')).result;
-        assert.deepEqual(CommonUtil.isFailedTx(_.get(createAppRes, 'result')), false);
-        if (!(await waitUntilTxFinalized(parentServerList, createAppRes.tx_hash))) {
-          console.log(`Failed to check finalization of create app tx.`)
-        }
+        const { shard_owner, sharding_path } = shardingConfig;
+        await setUpApp('a_dapp', parentServerList, { admin: { [shard_owner]: true } });
+
         const res = parseOrLog(syncRequest('POST', parentServer + '/set', {
           json: {
             op_list: [
@@ -1950,14 +2035,16 @@ describe('Sharding', async () => {
                 type: WriteDbOperations.SET_RULE,
                 ref: `${sharding_path}/${ShardingProperties.LATEST}`,
                 value: {
-                  [RuleProperties.WRITE]: `auth.fid === '${NativeFunctionIds.UPDATE_LATEST_SHARD_REPORT}'`
+                  [PredefinedDbPaths.DOT_RULE]: {
+                    [RuleProperties.WRITE]: `auth.fid === '${NativeFunctionIds.UPDATE_LATEST_SHARD_REPORT}'`
+                  }
                 }
               },
               {
                 type: WriteDbOperations.SET_FUNCTION,
                 ref: `${sharding_path}/$block_number/${ShardingProperties.PROOF_HASH}`,
                 value: {
-                  [FunctionProperties.FUNCTION]: {
+                  [PredefinedDbPaths.DOT_FUNCTION]: {
                     [NativeFunctionIds.UPDATE_LATEST_SHARD_REPORT]: {
                       [FunctionProperties.FUNCTION_TYPE]: FunctionTypes.NATIVE,
                       [FunctionProperties.FUNCTION_ID]: NativeFunctionIds.UPDATE_LATEST_SHARD_REPORT
@@ -1997,24 +2084,33 @@ describe('Sharding', async () => {
           "func_results": {
             "_updateLatestShardReport": {
               "code": "SUCCESS",
-              "gas_amount": 0,
-              "op_results": [
-                {
+              "bandwidth_gas_amount": 0,
+              "op_results": {
+                "0": {
                   "path": "/apps/a_dapp/latest",
                   "result": {
                     "code": 0,
-                    "gas_amount": 1,
+                    "bandwidth_gas_amount": 1,
                   }
                 }
-              ]
+              }
             }
           },
-          "gas_amount": 1,
+          "bandwidth_gas_amount": 1,
+          "gas_amount_charged": 0,
           "gas_amount_total": {
-            "app": {
-              "a_dapp": 2
+            "bandwidth": {
+              "app": {
+                "a_dapp": 2
+              },
+              "service": 0
             },
-            "service": 0
+            "state": {
+              "app": {
+                "a_dapp": 710
+              },
+              "service": 0
+            }
           },
           "gas_cost_total": 0,
         });
@@ -2049,42 +2145,51 @@ describe('Sharding', async () => {
             'POST', parentServer + '/set', { json: multipleReportVal }).body.toString('utf-8')
         );
         assert.deepEqual(_.get(shardReportBody, 'result.result'), {
-          "result_list": [
-            {
+          "result_list": {
+            "0": {
               "code": 0,
               "func_results": {
                 "_updateLatestShardReport": {
                   "code": "SUCCESS",
-                  "gas_amount": 0,
-                  "op_results": [
-                    {
+                  "bandwidth_gas_amount": 0,
+                  "op_results": {
+                    "0": {
                       "path": "/apps/a_dapp/latest",
                       "result": {
                         "code": 0,
-                        "gas_amount": 1,
+                        "bandwidth_gas_amount": 1,
                       }
                     }
-                  ]
+                  }
                 }
               },
-              "gas_amount": 1,
+              "bandwidth_gas_amount": 1,
             },
-            {
+            "1": {
               "code": 0,
               "func_results": {
                 "_updateLatestShardReport": {
                   "code": "SUCCESS",
-                  "gas_amount": 0,
+                  "bandwidth_gas_amount": 0,
                 }
               },
-              "gas_amount": 1
+              "bandwidth_gas_amount": 1
             }
-          ],
+          },
+          "gas_amount_charged": 0,
           "gas_amount_total": {
-            "app": {
-              "a_dapp": 3
+            "bandwidth": {
+              "app": {
+                "a_dapp": 3
+              },
+              "service": 0
             },
-            "service": 0
+            "state": {
+              "app": {
+                "a_dapp": 748
+              },
+              "service": 0
+            }
           },
           "gas_cost_total": 0,
         });
diff --git a/json_rpc/index.js b/json_rpc/index.js
index 62766de53..5ceb5f5a6 100644
--- a/json_rpc/index.js
+++ b/json_rpc/index.js
@@ -5,12 +5,12 @@ const sizeof = require('object-sizeof');
 const _ = require('lodash');
 const {
   CURRENT_PROTOCOL_VERSION,
-  BlockchainNodeStates,
-  ReadDbOperations,
-  TransactionStates,
   TX_BYTES_LIMIT,
   BATCH_TX_LIST_SIZE_LIMIT,
   NETWORK_ID,
+  BlockchainNodeStates,
+  ReadDbOperations,
+  PredefinedDbPaths,
 } = require('../common/constants');
 const Transaction = require('../tx-pool/transaction');
 const CommonUtil = require('../common/common-util');
@@ -216,23 +216,7 @@ module.exports = function getMethods(node, p2pServer, minProtocolVersion, maxPro
     },
 
     ain_getTransactionByHash: function(args, done) {
-      const transactionInfo = node.tp.transactionTracker[args.hash];
-      if (transactionInfo) {
-        if (transactionInfo.state === TransactionStates.IN_BLOCK) {
-          const block = node.bc.getBlockByNumber(transactionInfo.number);
-          const index = transactionInfo.index;
-          if (!block) {
-            // TODO(liayoo): Ask peers for the transaction / block
-          } else if (index >= 0) {
-            transactionInfo.transaction = block.transactions[index];
-          } else {
-            transactionInfo.transaction = _.find(block.last_votes, (tx) => tx.hash === args.hash);
-          }
-        } else if (transactionInfo.state === TransactionStates.IN_POOL) {
-          const address = transactionInfo.address;
-          transactionInfo.transaction = _.find(node.tp.transactions[address], (tx) => tx.hash === args.hash);
-        }
-      }
+      const transactionInfo = node.getTransactionByHash(args.hash);
       done(null, addProtocolVersion({result: transactionInfo}));
     },
 
@@ -271,27 +255,27 @@ module.exports = function getMethods(node, p2pServer, minProtocolVersion, maxPro
       switch (args.type) {
         case ReadDbOperations.GET_VALUE:
           done(null, addProtocolVersion({
-            result: p2pServer.node.db.getValue(args.ref, args.is_shallow, args.is_global)
+            result: p2pServer.node.db.getValue(args.ref, CommonUtil.toGetOptions(args))
           }));
           return;
         case ReadDbOperations.GET_RULE:
           done(null, addProtocolVersion({
-            result: p2pServer.node.db.getRule(args.ref, args.is_shallow, args.is_global)
+            result: p2pServer.node.db.getRule(args.ref, CommonUtil.toGetOptions(args))
           }));
           return;
         case ReadDbOperations.GET_FUNCTION:
           done(null, addProtocolVersion({
-            result: p2pServer.node.db.getFunction(args.ref, args.is_shallow, args.is_global)
+            result: p2pServer.node.db.getFunction(args.ref, CommonUtil.toGetOptions(args))
           }));
           return;
         case ReadDbOperations.GET_OWNER:
           done(null, addProtocolVersion({
-            result: p2pServer.node.db.getOwner(args.ref, args.is_shallow, args.is_global)
+            result: p2pServer.node.db.getOwner(args.ref, CommonUtil.toGetOptions(args))
           }));
           return;
         case ReadDbOperations.GET:
           done(null, addProtocolVersion({
-            result: p2pServer.node.db.get(args.op_list, args.is_global)
+            result: p2pServer.node.db.get(args.op_list)
           }));
           return;
         default:
@@ -300,17 +284,18 @@ module.exports = function getMethods(node, p2pServer, minProtocolVersion, maxPro
     },
 
     ain_matchFunction: function(args, done) {
-      const result = p2pServer.node.db.matchFunction(args.ref, args.is_global);
+      const result =
+          p2pServer.node.db.matchFunction(args.ref, CommonUtil.toMatchOrEvalOptions(args));
       done(null, addProtocolVersion({result}));
     },
 
     ain_matchRule: function(args, done) {
-      const result = p2pServer.node.db.matchRule(args.ref, args.is_global);
+      const result = p2pServer.node.db.matchRule(args.ref, CommonUtil.toMatchOrEvalOptions(args));
       done(null, addProtocolVersion({result}));
     },
 
     ain_matchOwner: function(args, done) {
-      const result = p2pServer.node.db.matchOwner(args.ref, args.is_global);
+      const result = p2pServer.node.db.matchOwner(args.ref, CommonUtil.toMatchOrEvalOptions(args));
       done(null, addProtocolVersion({result}));
     },
 
@@ -322,8 +307,9 @@ module.exports = function getMethods(node, p2pServer, minProtocolVersion, maxPro
       if (args.fid) {
         auth.fid = args.fid;
       }
+      const timestamp = args.timestamp || Date.now();
       const result = p2pServer.node.db.evalRule(
-          args.ref, args.value, auth, args.timestamp || Date.now(), args.is_global);
+          args.ref, args.value, auth, timestamp, CommonUtil.toMatchOrEvalOptions(args));
       done(null, addProtocolVersion({result}));
     },
 
@@ -335,8 +321,8 @@ module.exports = function getMethods(node, p2pServer, minProtocolVersion, maxPro
       if (args.fid) {
         auth.fid = args.fid;
       }
-      const result =
-          p2pServer.node.db.evalOwner(args.ref, args.permission, auth, args.is_global);
+      const result = p2pServer.node.db.evalOwner(
+          args.ref, args.permission, auth, CommonUtil.toMatchOrEvalOptions(args));
       done(null, addProtocolVersion({result}));
     },
 
@@ -350,6 +336,11 @@ module.exports = function getMethods(node, p2pServer, minProtocolVersion, maxPro
       done(null, addProtocolVersion({result}));
     },
 
+    ain_getStateUsage: function(args, done) {
+      const result = p2pServer.node.getStateUsage(args.app_name);
+      done(null, addProtocolVersion({result}));
+    },
+
     // Account API
     ain_getAddress: function(args, done) {
       done(null, addProtocolVersion({
@@ -369,6 +360,12 @@ module.exports = function getMethods(node, p2pServer, minProtocolVersion, maxPro
         }));
     },
 
+    ain_getTimestamp: function(args, done) {
+      done(null, addProtocolVersion({
+          result: p2pServer.node.getTimestampForAddr(args.address, args.from === 'pending')
+        }));
+    },
+
     ain_isValidator: function(args, done) {
       const addr = args.address;
       const whitelisted = p2pServer.node.db.getValue(PathUtil.getConsensusWhitelistAddrPath(addr));
diff --git a/monitoring/grafana.json b/monitoring/grafana.json
index a48a355f8..594e5c450 100644
--- a/monitoring/grafana.json
+++ b/monitoring/grafana.json
@@ -15,7 +15,7 @@
   "editable": true,
   "gnetId": null,
   "graphTooltip": 0,
-  "id": 1,
+  "id": 4,
   "links": [],
   "panels": [
     {
@@ -24,10 +24,6 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": null,
-      "fieldConfig": {
-        "defaults": {},
-        "overrides": []
-      },
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
@@ -54,7 +50,7 @@
         "alertThreshold": true
       },
       "percentage": false,
-      "pluginVersion": "7.5.3",
+      "pluginVersion": "8.0.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
@@ -117,10 +113,6 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": null,
-      "fieldConfig": {
-        "defaults": {},
-        "overrides": []
-      },
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
@@ -147,7 +139,7 @@
         "alertThreshold": true
       },
       "percentage": false,
-      "pluginVersion": "7.5.3",
+      "pluginVersion": "8.0.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
@@ -210,10 +202,6 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": null,
-      "fieldConfig": {
-        "defaults": {},
-        "overrides": []
-      },
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
@@ -240,7 +228,7 @@
         "alertThreshold": true
       },
       "percentage": false,
-      "pluginVersion": "7.5.3",
+      "pluginVersion": "8.0.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
@@ -303,10 +291,6 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": null,
-      "fieldConfig": {
-        "defaults": {},
-        "overrides": []
-      },
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
@@ -333,7 +317,7 @@
         "alertThreshold": true
       },
       "percentage": false,
-      "pluginVersion": "7.5.3",
+      "pluginVersion": "8.0.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
@@ -396,10 +380,6 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": null,
-      "fieldConfig": {
-        "defaults": {},
-        "overrides": []
-      },
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
@@ -426,7 +406,7 @@
         "alertThreshold": true
       },
       "percentage": false,
-      "pluginVersion": "7.5.3",
+      "pluginVersion": "8.0.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
@@ -437,15 +417,17 @@
       "targets": [
         {
           "exemplar": true,
-          "expr": "cpu_status:usage",
+          "expr": "cpu_status:usage_percent",
           "interval": "",
           "legendFormat": "",
           "refId": "A"
         }
       ],
       "thresholds": [],
+      "timeFrom": null,
       "timeRegions": [],
-      "title": "cpu_status:usage",
+      "timeShift": null,
+      "title": "cpu_status:usage_percent",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -488,10 +470,6 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": null,
-      "fieldConfig": {
-        "defaults": {},
-        "overrides": []
-      },
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
@@ -518,7 +496,7 @@
         "alertThreshold": true
       },
       "percentage": false,
-      "pluginVersion": "7.5.3",
+      "pluginVersion": "8.0.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
@@ -575,26 +553,103 @@
         "alignLevel": null
       }
     },
+    {
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 24
+      },
+      "id": 38,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "targets": [
+        {
+          "exemplar": true,
+          "expr": "disk_status:usage_percent",
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "title": "disk_status:usage_percent",
+      "type": "timeseries"
+    },
     {
       "aliasColors": {},
       "bars": false,
       "dashLength": 10,
       "dashes": false,
       "datasource": null,
-      "fieldConfig": {
-        "defaults": {},
-        "overrides": []
-      },
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
         "h": 8,
         "w": 12,
-        "x": 12,
-        "y": 24
+        "x": 0,
+        "y": 25
       },
       "hiddenSeries": false,
-      "id": 12,
+      "id": 24,
       "legend": {
         "avg": false,
         "current": false,
@@ -611,7 +666,7 @@
         "alertThreshold": true
       },
       "percentage": false,
-      "pluginVersion": "7.5.3",
+      "pluginVersion": "8.0.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
@@ -621,7 +676,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "disk_status:used",
+          "expr": "consensus_status:health",
           "interval": "",
           "legendFormat": "",
           "refId": "A"
@@ -631,7 +686,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "disk_status:used",
+      "title": "consensus_status:health",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -674,20 +729,16 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": null,
-      "fieldConfig": {
-        "defaults": {},
-        "overrides": []
-      },
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
         "h": 8,
         "w": 12,
-        "x": 0,
-        "y": 25
+        "x": 12,
+        "y": 32
       },
       "hiddenSeries": false,
-      "id": 24,
+      "id": 12,
       "legend": {
         "avg": false,
         "current": false,
@@ -704,7 +755,7 @@
         "alertThreshold": true
       },
       "percentage": false,
-      "pluginVersion": "7.5.3",
+      "pluginVersion": "8.0.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
@@ -714,7 +765,8 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "consensus_status:health",
+          "exemplar": true,
+          "expr": "disk_status:usage",
           "interval": "",
           "legendFormat": "",
           "refId": "A"
@@ -724,7 +776,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "consensus_status:health",
+      "title": "disk_status:usage",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -767,20 +819,16 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": null,
-      "fieldConfig": {
-        "defaults": {},
-        "overrides": []
-      },
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
         "h": 8,
         "w": 12,
-        "x": 12,
-        "y": 32
+        "x": 0,
+        "y": 33
       },
       "hiddenSeries": false,
-      "id": 14,
+      "id": 20,
       "legend": {
         "avg": false,
         "current": false,
@@ -797,7 +845,7 @@
         "alertThreshold": true
       },
       "percentage": false,
-      "pluginVersion": "7.5.3",
+      "pluginVersion": "8.0.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
@@ -807,7 +855,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "memory_status:heap_stats:used_heap_size",
+          "expr": "consensus_status:state_numeric",
           "interval": "",
           "legendFormat": "",
           "refId": "A"
@@ -817,7 +865,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "memory_status:heap_stats:used_heap_size",
+      "title": "consensus_status:state_numeric",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -854,26 +902,103 @@
         "alignLevel": null
       }
     },
+    {
+      "datasource": null,
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 40
+      },
+      "id": 40,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom"
+        },
+        "tooltip": {
+          "mode": "single"
+        }
+      },
+      "targets": [
+        {
+          "exemplar": true,
+          "expr": "memory_status:os:usage_percent",
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "title": "memory_status:os:usage_percent",
+      "type": "timeseries"
+    },
     {
       "aliasColors": {},
       "bars": false,
       "dashLength": 10,
       "dashes": false,
       "datasource": null,
-      "fieldConfig": {
-        "defaults": {},
-        "overrides": []
-      },
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
         "h": 8,
         "w": 12,
         "x": 0,
-        "y": 33
+        "y": 41
       },
       "hiddenSeries": false,
-      "id": 20,
+      "id": 18,
       "legend": {
         "avg": false,
         "current": false,
@@ -890,7 +1015,7 @@
         "alertThreshold": true
       },
       "percentage": false,
-      "pluginVersion": "7.5.3",
+      "pluginVersion": "8.0.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
@@ -900,7 +1025,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "consensus_status:state_numeric",
+          "expr": "node_status:state_numeric",
           "interval": "",
           "legendFormat": "",
           "refId": "A"
@@ -910,7 +1035,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "consensus_status:state_numeric",
+      "title": "node_status:state_numeric",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -953,20 +1078,16 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": null,
-      "fieldConfig": {
-        "defaults": {},
-        "overrides": []
-      },
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
         "h": 8,
         "w": 12,
         "x": 12,
-        "y": 40
+        "y": 48
       },
       "hiddenSeries": false,
-      "id": 30,
+      "id": 14,
       "legend": {
         "avg": false,
         "current": false,
@@ -983,7 +1104,7 @@
         "alertThreshold": true
       },
       "percentage": false,
-      "pluginVersion": "7.5.3",
+      "pluginVersion": "8.0.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
@@ -993,7 +1114,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "memory_status:heap_stats:malloced_memory",
+          "expr": "memory_status:heap_stats:used_heap_size",
           "interval": "",
           "legendFormat": "",
           "refId": "A"
@@ -1003,7 +1124,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "memory_status:heap_stats:malloced_memory",
+      "title": "memory_status:heap_stats:used_heap_size",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -1046,20 +1167,16 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": null,
-      "fieldConfig": {
-        "defaults": {},
-        "overrides": []
-      },
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
         "h": 8,
         "w": 12,
         "x": 0,
-        "y": 41
+        "y": 49
       },
       "hiddenSeries": false,
-      "id": 18,
+      "id": 26,
       "legend": {
         "avg": false,
         "current": false,
@@ -1076,7 +1193,7 @@
         "alertThreshold": true
       },
       "percentage": false,
-      "pluginVersion": "7.5.3",
+      "pluginVersion": "8.0.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
@@ -1086,7 +1203,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "node_status:state_numeric",
+          "expr": "tx_status:tx_pool_size",
           "interval": "",
           "legendFormat": "",
           "refId": "A"
@@ -1096,7 +1213,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "node_status:state_numeric",
+      "title": "tx_status:tx_pool_size",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -1139,20 +1256,16 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": null,
-      "fieldConfig": {
-        "defaults": {},
-        "overrides": []
-      },
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
         "h": 8,
         "w": 12,
         "x": 12,
-        "y": 48
+        "y": 56
       },
       "hiddenSeries": false,
-      "id": 8,
+      "id": 30,
       "legend": {
         "avg": false,
         "current": false,
@@ -1169,7 +1282,7 @@
         "alertThreshold": true
       },
       "percentage": false,
-      "pluginVersion": "7.5.3",
+      "pluginVersion": "8.0.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
@@ -1179,7 +1292,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "node_status:state_version_status:num_versions",
+          "expr": "memory_status:heap_stats:malloced_memory",
           "interval": "",
           "legendFormat": "",
           "refId": "A"
@@ -1189,7 +1302,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "node_status:state_version_status:num_versions",
+      "title": "memory_status:heap_stats:malloced_memory",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -1232,20 +1345,16 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": null,
-      "fieldConfig": {
-        "defaults": {},
-        "overrides": []
-      },
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
         "h": 8,
         "w": 12,
         "x": 0,
-        "y": 49
+        "y": 57
       },
       "hiddenSeries": false,
-      "id": 26,
+      "id": 28,
       "legend": {
         "avg": false,
         "current": false,
@@ -1262,7 +1371,7 @@
         "alertThreshold": true
       },
       "percentage": false,
-      "pluginVersion": "7.5.3",
+      "pluginVersion": "8.0.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
@@ -1272,7 +1381,7 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "tx_status:tx_pool_size",
+          "expr": "tx_status:tx_tracker_size",
           "interval": "",
           "legendFormat": "",
           "refId": "A"
@@ -1282,7 +1391,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "tx_status:tx_pool_size",
+      "title": "tx_status:tx_tracker_size",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -1325,17 +1434,102 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": null,
-      "fieldConfig": {
-        "defaults": {},
-        "overrides": []
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 12,
+        "y": 64
+      },
+      "hiddenSeries": false,
+      "id": 8,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "null",
+      "options": {
+        "alertThreshold": true
+      },
+      "percentage": false,
+      "pluginVersion": "8.0.6",
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "node_status:state_version_status:num_versions",
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "node_status:state_version_status:num_versions",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
       },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
         "h": 8,
         "w": 12,
         "x": 12,
-        "y": 56
+        "y": 72
       },
       "hiddenSeries": false,
       "id": 10,
@@ -1355,7 +1549,7 @@
         "alertThreshold": true
       },
       "percentage": false,
-      "pluginVersion": "7.5.3",
+      "pluginVersion": "8.0.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
@@ -1418,20 +1612,16 @@
       "dashLength": 10,
       "dashes": false,
       "datasource": null,
-      "fieldConfig": {
-        "defaults": {},
-        "overrides": []
-      },
       "fill": 1,
       "fillGradient": 0,
       "gridPos": {
         "h": 8,
         "w": 12,
-        "x": 0,
-        "y": 57
+        "x": 12,
+        "y": 80
       },
       "hiddenSeries": false,
-      "id": 28,
+      "id": 36,
       "legend": {
         "avg": false,
         "current": false,
@@ -1448,7 +1638,7 @@
         "alertThreshold": true
       },
       "percentage": false,
-      "pluginVersion": "7.5.3",
+      "pluginVersion": "8.0.6",
       "pointradius": 2,
       "points": false,
       "renderer": "flot",
@@ -1458,7 +1648,8 @@
       "steppedLine": false,
       "targets": [
         {
-          "expr": "tx_status:tx_tracker_size",
+          "exemplar": true,
+          "expr": "node_status:db_status:state_info:tree_bytes",
           "interval": "",
           "legendFormat": "",
           "refId": "A"
@@ -1468,7 +1659,7 @@
       "timeFrom": null,
       "timeRegions": [],
       "timeShift": null,
-      "title": "tx_status:tx_tracker_size",
+      "title": "node_status:db_status:state_info:tree_bytes",
       "tooltip": {
         "shared": true,
         "sort": 0,
@@ -1506,7 +1697,8 @@
       }
     }
   ],
-  "schemaVersion": 27,
+  "refresh": "5s",
+  "schemaVersion": 30,
   "style": "dark",
   "tags": [],
   "templating": {
@@ -1520,5 +1712,5 @@
   "timezone": "",
   "title": "Blockchain Servers",
   "uid": "M6YpMSyMz",
-  "version": 6
-}
+  "version": 30
+}
\ No newline at end of file
diff --git a/node/index.js b/node/index.js
index 11b44c9df..937a4b08f 100644
--- a/node/index.js
+++ b/node/index.js
@@ -1,7 +1,6 @@
 /* eslint guard-for-in: "off" */
 const ainUtil = require('@ainblockchain/ain-util');
 const _ = require('lodash');
-const fs = require('fs');
 const path = require('path');
 const logger = require('../logger')('NODE');
 const {
@@ -9,8 +8,7 @@ const {
   PORT,
   ACCOUNT_INDEX,
   SYNC_MODE,
-  TX_NONCE_ERROR_CODE,
-  TX_TIMESTAMP_ERROR_CODE,
+  ON_MEMORY_CHAIN_LENGTH,
   SNAPSHOTS_ROOT_DIR,
   SNAPSHOTS_INTERVAL_BLOCK_NUMBER,
   MAX_NUM_SNAPSHOTS,
@@ -20,11 +18,13 @@ const {
   ShardingProtocols,
   GenesisAccounts,
   GenesisSharding,
+  TransactionStates,
   StateVersions,
   SyncModeOptions,
   LIGHTWEIGHT,
   TX_POOL_SIZE_LIMIT,
   TX_POOL_SIZE_LIMIT_PER_ACCOUNT,
+  MAX_BLOCK_NUMBERS_FOR_RECEIPTS,
 } = require('../common/constants');
 const FileUtil = require('../common/file-util');
 const CommonUtil = require('../common/common-util');
@@ -34,8 +34,6 @@ const StateManager = require('../db/state-manager');
 const DB = require('../db');
 const Transaction = require('../tx-pool/transaction');
 
-// TODO(platfowner): Migrate nonce to getAccountNonceAndTimestamp() and
-// updateAccountNonceAndTimestamp().
 class BlockchainNode {
   constructor() {
     const LOG_HEADER = 'constructor';
@@ -57,9 +55,11 @@ class BlockchainNode {
     this.tp = new TransactionPool(this);
     this.stateManager = new StateManager();
     const initialVersion = `${StateVersions.NODE}:${this.bc.lastBlockNumber()}`;
-    this.db = this.createDb(StateVersions.EMPTY, initialVersion, this.bc, this.tp, false, true);
-    this.nonce = null;  // nonce from current final version
+    this.db = DB.create(
+        StateVersions.EMPTY, initialVersion, this.bc, this.tp, false, true,
+        this.bc.lastBlockNumber(), this.stateManager);
     this.state = BlockchainNodeStates.STARTING;
+    logger.info(`Now node in STARTING state!`);
     this.snapshotDir = path.resolve(SNAPSHOTS_ROOT_DIR, `${PORT}`);
     FileUtil.createSnapshotDir(this.snapshotDir);
   }
@@ -85,14 +85,15 @@ class BlockchainNode {
   }
 
   init(isFirstNode) {
-    const LOG_HEADER = 'init';
-    logger.info(`[${LOG_HEADER}] Initializing node..`);
+    const LOG_HEADER = 'BlockchainNode.init';
+
     let latestSnapshot = null;
     let latestSnapshotPath = null;
     let latestSnapshotBlockNumber = -1;
 
     // 1. Get the latest snapshot if in the "fast" sync mode.
     if (SYNC_MODE === SyncModeOptions.FAST) {
+      logger.info(`[${LOG_HEADER}] Initializing node in 'fast' mode..`);
       const latestSnapshotInfo = FileUtil.getLatestSnapshotInfo(this.snapshotDir);
       latestSnapshotPath = latestSnapshotInfo.latestSnapshotPath;
       latestSnapshotBlockNumber = latestSnapshotInfo.latestSnapshotBlockNumber;
@@ -103,28 +104,41 @@ class BlockchainNode {
           logger.error(`[${LOG_HEADER}] ${err.stack}`);
         }
       }
+      logger.info(`[${LOG_HEADER}] Fast mode sync done!`);
+    } else {
+      logger.info(`[${LOG_HEADER}] Initializing node in 'full' mode..`);
     }
 
-    // 2. Initialize the blockchain, starting from `latestSnapshotBlockNumber`.
-    const lastBlockWithoutProposal = this.bc.init(isFirstNode, latestSnapshotBlockNumber);
-
-    // 3. Initialize DB (with the latest snapshot, if it exists)
-    const startingDb =
-        this.createDb(StateVersions.EMPTY, StateVersions.START, this.bc, this.tp, true);
+    // 2. Initialize DB (with the latest snapshot, if it exists)
+    logger.info(`[${LOG_HEADER}] Initializing DB..`);
+    const startingDb = DB.create(
+        StateVersions.EMPTY, StateVersions.START, this.bc, this.tp, true, false,
+        latestSnapshotBlockNumber, this.stateManager);
     startingDb.initDbStates(latestSnapshot);
 
+    // 3. Initialize the blockchain, starting from `latestSnapshotBlockNumber`.
+    logger.info(`[${LOG_HEADER}] Initializing blockchain..`);
+    const { wasBlockDirEmpty, isGenesisStart } =
+        this.bc.init(isFirstNode, latestSnapshotBlockNumber);
+
     // 4. Execute the chain on the DB and finalize it.
-    this.executeChainOnDb(startingDb);
+    logger.info(`[${LOG_HEADER}] Executing chains on DB if needed..`);
+    let lastBlockWithoutProposal = null;
+    if (!wasBlockDirEmpty || isGenesisStart) {
+      lastBlockWithoutProposal =
+          this.loadAndExecuteChainOnDb(latestSnapshotBlockNumber, !wasBlockDirEmpty, startingDb);
+    }
     this.cloneAndFinalizeVersion(StateVersions.START, this.bc.lastBlockNumber());
-    this.nonce = this.getNonceForAddr(this.account.address, false, true);
 
     // 5. Execute transactions from the pool.
+    logger.info(`[${LOG_HEADER}] Executing the transaction from the tx pool..`);
     this.db.executeTransactionList(
-        this.tp.getValidTransactions(null, this.stateManager.getFinalVersion()),
+        this.tp.getValidTransactions(null, this.stateManager.getFinalVersion()), false, true,
         this.bc.lastBlockNumber() + 1);
 
     // 6. Node status changed: STARTING -> SYNCING.
     this.state = BlockchainNodeStates.SYNCING;
+    logger.info(`[${LOG_HEADER}] Now node in SYNCING state!`);
 
     return lastBlockWithoutProposal;
   }
@@ -141,31 +155,6 @@ class BlockchainNode {
     return new DB(tempRoot, tempVersion, null, null, false, blockNumberSnapshot, this.stateManager);
   }
 
-  createDb(baseVersion, newVersion, bc, tp, finalizeVersion, isNodeDb, blockNumberSnapshot) {
-    const LOG_HEADER = 'createDb';
-
-    logger.info(`[${LOG_HEADER}] Creating a new DB by cloning state version: ` +
-        `${baseVersion} -> ${newVersion}`);
-    const newRoot = this.stateManager.cloneVersion(baseVersion, newVersion);
-    if (!newRoot) {
-      logger.error(
-          `[${LOG_HEADER}] Failed to clone state version: ${baseVersion} -> ${newVersion}`);
-      return null;
-    }
-    if (finalizeVersion) {
-      this.stateManager.finalizeVersion(newVersion);
-    }
-    return new DB(newRoot, newVersion, bc, tp, isNodeDb, blockNumberSnapshot, this.stateManager);
-  }
-
-  destroyDb(db) {
-    const LOG_HEADER = 'destroyDb';
-
-    logger.info(`[${LOG_HEADER}] Destroying DB with state version: ${db.stateVersion}`);
-    db.deleteStateVersion();
-    db.deleteBackupStateVersion();
-  }
-
   syncDbAndNonce(newVersion) {
     const LOG_HEADER = 'syncDbAndNonce';
 
@@ -180,8 +169,6 @@ class BlockchainNode {
           `${this.stateManager.getFinalVersion()}`);
     }
     this.db.setStateVersion(newVersion, clonedRoot);
-    const { nonce } = this.db.getAccountNonceAndTimestamp(this.account.address);
-    this.nonce = nonce;
     return true;
   }
 
@@ -219,32 +206,71 @@ class BlockchainNode {
 
   updateSnapshots(blockNumber) {
     if (blockNumber > 0 && blockNumber % SNAPSHOTS_INTERVAL_BLOCK_NUMBER === 0) {
-      const snapshot = this.dumpFinalVersion(false);
+      const snapshot = this.dumpFinalDbStates();
       FileUtil.writeSnapshot(this.snapshotDir, blockNumber, snapshot);
       FileUtil.writeSnapshot(
           this.snapshotDir, blockNumber - MAX_NUM_SNAPSHOTS * SNAPSHOTS_INTERVAL_BLOCK_NUMBER, null);
     }
   }
 
-  dumpFinalVersion(withDetails) {
-    return this.stateManager.getFinalRoot().toJsObject(withDetails);
+  dumpFinalDbStates(options) {
+    return this.stateManager.getFinalRoot().toJsObject(options);
+  }
+
+  getTransactionByHash(hash) {
+    const transactionInfo = this.tp.transactionTracker[hash];
+    if (!transactionInfo) {
+      return null;
+    }
+
+    if (transactionInfo.state === TransactionStates.IN_BLOCK) {
+      const block = this.bc.getBlockByNumber(transactionInfo.number);
+      const index = transactionInfo.index;
+      if (!block) {
+        // TODO(liayoo): Ask peers for the transaction / block
+      } else if (index >= 0) {
+        transactionInfo.transaction = block.transactions[index];
+      } else {
+        transactionInfo.transaction =
+            _.find(block.last_votes, (tx) => tx.hash === hash) || null;
+      }
+    } else if (transactionInfo.state === TransactionStates.EXECUTED ||
+        transactionInfo.state === TransactionStates.PENDING) {
+      const address = transactionInfo.address;
+      transactionInfo.transaction =
+          _.find(this.tp.transactions[address], (tx) => tx.hash === hash) || null;
+    }
+    return transactionInfo;
+  }
+
+  getNonce(fromPending = true) {
+    return this.getNonceForAddr(this.account.address, fromPending);
   }
 
-  getNonceForAddr(address, fromPending, fromDb = false) {
+  getNonceForAddr(address, fromPending = true) {
     if (!CommonUtil.isValAddr(address)) return -1;
     const cksumAddr = CommonUtil.toCksumAddr(address);
     if (fromPending) {
       const { nonce } = this.db.getAccountNonceAndTimestamp(cksumAddr);
       return nonce;
     }
-    if (!fromDb && cksumAddr === this.account.address) {
-      return this.nonce;
-    }
     const stateRoot = this.stateManager.getFinalRoot();
     const { nonce } = DB.getAccountNonceAndTimestampFromStateRoot(stateRoot, cksumAddr);
     return nonce;
   }
 
+  getTimestampForAddr(address, fromPending) {
+    if (!CommonUtil.isValAddr(address)) return -1;
+    const cksumAddr = CommonUtil.toCksumAddr(address);
+    if (fromPending) {
+      const { timestamp } = this.db.getAccountNonceAndTimestamp(cksumAddr);
+      return timestamp;
+    }
+    const stateRoot = this.stateManager.getFinalRoot();
+    const { timestamp } = DB.getAccountNonceAndTimestampFromStateRoot(stateRoot, cksumAddr);
+    return timestamp;
+  }
+
   getSharding() {
     const shardingInfo = {};
     if (this.db && this.db.stateRoot) {
@@ -254,9 +280,9 @@ class BlockchainNode {
         const shardPath = ainUtil.decode(encodedPath);
         shardingInfo[encodedPath] = {
           [ShardingProperties.SHARDING_ENABLED]: this.db.getValue(CommonUtil.appendPath(
-              shardPath, ShardingProperties.SHARD, ShardingProperties.SHARDING_ENABLED)),
+              shardPath, PredefinedDbPaths.DOT_SHARD, ShardingProperties.SHARDING_ENABLED)),
           [ShardingProperties.LATEST_BLOCK_NUMBER]: this.db.getValue(CommonUtil.appendPath(
-              shardPath, ShardingProperties.SHARD, ShardingProperties.PROOF_HASH_MAP,
+              shardPath, PredefinedDbPaths.DOT_SHARD, ShardingProperties.PROOF_HASH_MAP,
               ShardingProperties.LATEST)),
         };
       }
@@ -264,6 +290,11 @@ class BlockchainNode {
     return shardingInfo;
   }
 
+  getStateUsage(appName) {
+    if (!appName) return null;
+    return this.db.getStateUsageAtPath(`${PredefinedDbPaths.APPS}/${appName}`);
+  }
+
   getTxPoolSizeUtilization(address) {
     const result = {};
     if (address) { // Per account
@@ -311,8 +342,7 @@ class BlockchainNode {
 
   createSingleTransaction(txBody) {
     if (txBody.nonce === undefined) {
-      const { nonce } = this.db.getAccountNonceAndTimestamp(this.account.address);
-      txBody.nonce = nonce;
+      txBody.nonce = this.getNonce();
     }
     if (txBody.timestamp === undefined) {
       txBody.timestamp = Date.now();
@@ -323,28 +353,6 @@ class BlockchainNode {
     return Transaction.fromTxBody(txBody, this.account.private_key);
   }
 
-  /**
-   * Try to executes a transaction on the node database. If it was not successful, all changes are
-   * rolled back from the database states.
-   * @param {Object} tx transaction
-   */
-  executeOrRollbackTransaction(tx) {
-    const LOG_HEADER = 'executeOrRollbackTransaction';
-    if (!this.db.backupDb()) {
-      return CommonUtil.logAndReturnTxResult(
-          logger, 3,
-          `[${LOG_HEADER}] Failed to backup db for tx: ${JSON.stringify(tx, null, 2)}`);
-    }
-    const result = this.db.executeTransaction(tx, this.bc.lastBlockNumber() + 1);
-    if (CommonUtil.isFailedTx(result)) {
-      if (!this.db.restoreDb()) {
-        logger.error(
-          `[${LOG_HEADER}] Failed to restore db for tx: ${JSON.stringify(tx, null, 2)}`);
-      }
-    }
-    return result;
-  }
-
   /**
    * Executes a transaction and add it to the transaction pool if the execution was successful.
    * @param {Object} tx transaction
@@ -376,19 +384,21 @@ class BlockchainNode {
           `[${LOG_HEADER}] Tx pool does NOT have enough room (${perAccountPoolSize}) ` +
           `for account: ${executableTx.address}`);
     }
-    const result = this.executeOrRollbackTransaction(executableTx);
+    const result = this.db.executeTransaction(executableTx, false, true, this.bc.lastBlockNumber() + 1);
     if (CommonUtil.isFailedTx(result)) {
       if (FeatureFlags.enableRichTransactionLogging) {
         logger.error(
             `[${LOG_HEADER}] FAILED TRANSACTION: ${JSON.stringify(executableTx, null, 2)}\n ` +
             `WITH RESULT:${JSON.stringify(result)}`);
       }
-      const errorCode = _.get(result, 'code');
-      if (errorCode === TX_NONCE_ERROR_CODE || errorCode === TX_TIMESTAMP_ERROR_CODE) {
+      // NOTE(liayoo): Transactions that don't pass the pre-checks will be rejected instantly and
+      //               will not be included in the tx pool, as they can't be included in a block
+      //               anyway, and may be used for attacks on blockchain nodes.
+      if (!CommonUtil.txPrecheckFailed(result)) {
         this.tp.addTransaction(executableTx);
       }
     } else {
-      this.tp.addTransaction(executableTx);
+      this.tp.addTransaction(executableTx, true);
     }
 
     return result;
@@ -403,16 +413,36 @@ class BlockchainNode {
     return false;
   }
 
+  removeOldReceipts(blockNumber, db) {
+    const LOG_HEADER = 'removeOldReceipts';
+    if (blockNumber > MAX_BLOCK_NUMBERS_FOR_RECEIPTS) {
+      const receiptsPrefixFullPath = DB.getFullPath(
+          [PredefinedDbPaths.RECEIPTS], PredefinedDbPaths.VALUES_ROOT);
+      const oldBlock = this.bc.getBlockByNumber(blockNumber - MAX_BLOCK_NUMBERS_FOR_RECEIPTS);
+      if (oldBlock) {
+        oldBlock.transactions.forEach((tx) => {
+          db.writeDatabase([...receiptsPrefixFullPath, tx.hash], null);
+        });
+      } else {
+        logger.error(
+            `[${LOG_HEADER}] Non-existing block ${blockNumber - MAX_BLOCK_NUMBERS_FOR_RECEIPTS}.`);
+      }
+    }
+  }
+
   applyBlocksToDb(blockList, db) {
     const LOG_HEADER = 'applyBlocksToDb';
 
     for (const block of blockList) {
-      if (!db.executeTransactionList(block.last_votes)) {
-        logger.error(`[${LOG_HEADER}] Failed to execute last_votes of block: ` +
-            `${JSON.stringify(block, null, 2)}`);
-        return false;
+      this.removeOldReceipts(block.number, db);
+      if (block.number > 0) {
+        if (!db.executeTransactionList(block.last_votes, true)) {
+          logger.error(`[${LOG_HEADER}] Failed to execute last_votes of block: ` +
+              `${JSON.stringify(block, null, 2)}`);
+          return false;
+        }
       }
-      if (!db.executeTransactionList(block.transactions, block.number)) {
+      if (!db.executeTransactionList(block.transactions, block.number === 0, true, block.number)) {
         logger.error(`[${LOG_HEADER}] Failed to execute transactions of block: ` +
             `${JSON.stringify(block, null, 2)}`);
         return false;
@@ -438,6 +468,7 @@ class BlockchainNode {
         // TODO(liayoo): Ask the tracker server for another peer.
         logger.info(`[${LOG_HEADER}] Blockchain Node is now synced!`);
         this.state = BlockchainNodeStates.SERVING;
+        logger.info(`[${LOG_HEADER}] Now node in SERVING state.`);
       }
       return false;
     }
@@ -453,6 +484,7 @@ class BlockchainNode {
         // TODO(liayoo): Ask the tracker server for another peer.
         logger.info(`[${LOG_HEADER}] Blockchain Node is now synced!`);
         this.state = BlockchainNodeStates.SERVING;
+        logger.info(`[${LOG_HEADER}] Now node in SERVING state!`);
       }
       return false;
     }
@@ -462,7 +494,7 @@ class BlockchainNode {
         baseVersion, `${StateVersions.SEGMENT}:${this.bc.lastBlockNumber()}`,
         this.bc.lastBlockNumber());
     if (!tempDb) {
-      logger.error(`Failed to create a temp database with state version: ${baseVersion}.`);
+      logger.error(`[${LOG_HEADER}] Failed to create a temp database with state version: ${baseVersion}.`);
       return null;
     }
     const validBlocks = this.bc.getValidBlocksInChainSegment(chainSegment);
@@ -470,14 +502,14 @@ class BlockchainNode {
       if (!this.applyBlocksToDb(validBlocks, tempDb)) {
         logger.error(`[${LOG_HEADER}] Failed to apply valid blocks to database: ` +
             `${JSON.stringify(validBlocks, null, 2)}`);
-        this.destroyDb(tempDb);
+        tempDb.destroyDb();
         return false;
       }
       for (const block of validBlocks) {
         if (!this.bc.addNewBlockToChain(block)) {
           logger.error(`[${LOG_HEADER}] Failed to add new block to chain: ` +
               `${JSON.stringify(block, null, 2)}`);
-          this.destroyDb(tempDb);
+          tempDb.destroyDb();
           return false;
         }
       }
@@ -490,30 +522,73 @@ class BlockchainNode {
       logger.info(`[${LOG_HEADER}] No blocks to apply.`);
       return true;
     }
-    this.destroyDb(tempDb);
+    tempDb.destroyDb();
 
     return true;
   }
 
-  executeChainOnDb(db) {
-    const LOG_HEADER = 'executeChainOnDb';
+  executeBlockOnDb(block, db) {
+    const LOG_HEADER = 'executeBlockOnDb';
 
-    for (const block of this.bc.chain) {
-      if (!db.executeTransactionList(block.last_votes)) {
+    this.removeOldReceipts(block.number, db);
+    if (block.number > 0) {
+      if (!db.executeTransactionList(block.last_votes, true)) {
         logger.error(`[${LOG_HEADER}] Failed to execute last_votes (${block.number})`);
-        process.exit(1); // NOTE(liayoo): Quick fix for the problem. May be fixed by deleting the block files.
+        // NOTE(liayoo): Quick fix for the problem. May be fixed by deleting the block files.
+        process.exit(1);
+      }
+    }
+    if (!db.executeTransactionList(block.transactions, block.number === 0, true, block.number)) {
+      logger.error(`[${LOG_HEADER}] Failed to execute transactions (${block.number})`)
+      // NOTE(liayoo): Quick fix for the problem. May be fixed by deleting the block files.
+      process.exit(1);
+    }
+    if (block.state_proof_hash !== db.stateRoot.getProofHash()) {
+      logger.error(`[${LOG_HEADER}] Invalid state proof hash (${block.number}): ` +
+          `${db.stateRoot.getProofHash()}, ${block.state_proof_hash}`);
+      // NOTE(liayoo): Quick fix for the problem. May be fixed by deleting the block files.
+      process.exit(1);
+    }
+    this.tp.cleanUpForNewBlock(block);
+    logger.info(`[${LOG_HEADER}] Successfully executed block ${block.number} on DB.`);
+  }
+
+  loadAndExecuteChainOnDb(latestSnapshotBlockNumber, deleteLastBlock, db) {
+    const LOG_HEADER = 'loadAndExecuteChainOnDb';
+
+    let lastBlockWithoutProposal = null;
+    const numBlockFiles = this.bc.getNumBlockFiles();
+    const fromBlockNumber = SYNC_MODE === SyncModeOptions.FAST ? latestSnapshotBlockNumber + 1 : 0;
+    let prevBlockNumber = latestSnapshotBlockNumber;
+    let prevBlockHash = null;
+    for (let number = fromBlockNumber; number < numBlockFiles; number++) {
+      const block = this.bc.loadBlock(number);
+      if (!block) {
+        logger.error(`[${LOG_HEADER}] Failed to load block ${number}.`);
+        // NOTE(liayoo): Quick fix for the problem. May be fixed by deleting the block files.
+        process.exit(1);
       }
-      if (!db.executeTransactionList(block.transactions, block.number)) {
-        logger.error(`[${LOG_HEADER}] Failed to execute transactions (${block.number})`)
-        process.exit(1); // NOTE(liayoo): Quick fix for the problem. May be fixed by deleting the block files.
+      logger.info(`[${LOG_HEADER}] Successfully loaded block: ${block.number} / ${block.epoch}`);
+      if (!Blockchain.validateBlock(block, prevBlockNumber, prevBlockHash)) {
+        logger.error(`[${LOG_HEADER}] Failed to validate block ${number}.`);
+        // NOTE(liayoo): Quick fix for the problem. May be fixed by deleting the block files.
+        process.exit(1);
       }
-      if (block.state_proof_hash !== db.stateRoot.getProofHash()) {
-        logger.error(`[${LOG_HEADER}] Invalid state proof hash (${block.number}): ` +
-            `${db.stateRoot.getProofHash()}, ${block.state_proof_hash}`);
-        process.exit(1); // NOTE(liayoo): Quick fix for the problem. May be fixed by deleting the block files.
+      // NOTE(minsulee2): Deal with the case the only genesis block was generated.
+      if (deleteLastBlock && number > 0 && number === numBlockFiles - 1) {
+        lastBlockWithoutProposal = block;
+        this.bc.deleteBlock(lastBlockWithoutProposal);
+      } else {
+        this.executeBlockOnDb(block, db);
+        if (numBlockFiles - number <= ON_MEMORY_CHAIN_LENGTH) {
+          this.bc.addBlockToChain(block)
+        }
       }
-      this.tp.cleanUpForNewBlock(block);
+      prevBlockNumber = block.number;
+      prevBlockHash = block.hash;
     }
+
+    return lastBlockWithoutProposal;
   }
 }
 
diff --git a/p2p/index.js b/p2p/index.js
index dbd108e3f..0c3c3fce0 100644
--- a/p2p/index.js
+++ b/p2p/index.js
@@ -148,7 +148,6 @@ class P2pClient {
   }
 
   async setTrackerEventHandlers() {
-    const node = this.server.node;
     this.trackerWebSocket.on('message', async (message) => {
       const parsedMsg = JSON.parse(message);
       logger.info(`\n<< Message from [TRACKER]: ${JSON.stringify(parsedMsg, null, 2)}`);
@@ -156,16 +155,8 @@ class P2pClient {
         logger.debug(`Updated MANAGED peers info: ` +
           `${JSON.stringify(this.server.managedPeersInfo, null, 2)}`);
       }
-      if (node.state === BlockchainNodeStates.STARTING) {
-        if (parsedMsg.numLivePeers === 0) {
-          const lastBlockWithoutProposal = node.init(true);
-          await this.server.tryInitializeShard();
-          node.state = BlockchainNodeStates.SERVING;
-          this.server.consensus.init(lastBlockWithoutProposal);
-        } else {
-          // Consensus will be initialized after syncing with peers
-          node.init(false);
-        }
+      if (this.server.node.state === BlockchainNodeStates.STARTING) {
+        await this.startNode(parsedMsg.numLivePeers);
       }
     });
     this.trackerWebSocket.on('close', (code) => {
@@ -175,6 +166,32 @@ class P2pClient {
     });
   }
 
+  async startNode(numLivePeers) {
+    const LOG_HEADER = 'startNode';
+
+    if (numLivePeers === 0) {
+      logger.info(`[${LOG_HEADER}] Starting node without peers..`);
+      const lastBlockWithoutProposal = this.server.node.init(true);
+      logger.info(`[${LOG_HEADER}] lastBlockWithoutProposal=${lastBlockWithoutProposal}`);
+      logger.info(`[${LOG_HEADER}] Trying to initializing shard..`);
+      if (await this.server.tryInitializeShard()) {
+        logger.info(`[${LOG_HEADER}] Shard initialization done!`);
+      } else {
+        logger.info(`[${LOG_HEADER}] No need to initialize shard.`);
+      }
+      this.server.node.state = BlockchainNodeStates.SERVING;
+      logger.info(`[${LOG_HEADER}] Now node in SERVING state!`);
+      logger.info(`[${LOG_HEADER}] Initializing consensus process..`);
+      this.server.consensus.init(lastBlockWithoutProposal);
+      logger.info(`[${LOG_HEADER}] Consensus process initialized!`);
+    } else {
+      // Consensus will be initialized after syncing with peers
+      logger.info(`[${LOG_HEADER}] Starting node with ${numLivePeers} peers..`);
+      this.server.node.init(false);
+      logger.info(`[${LOG_HEADER}] Node initialized!`);
+    }
+  }
+
   connectToTracker() {
     logger.info(`Reconnecting to tracker (${TRACKER_WS_ADDR})`);
     this.trackerWebSocket = new Websocket(TRACKER_WS_ADDR);
@@ -250,8 +267,8 @@ class P2pClient {
     socket.send(JSON.stringify(payload));
   }
 
-  setPeerEventHandlers(socket) {
-    const LOG_HEADER = 'setPeerEventHandlers';
+  setClientSidePeerEventHandlers(socket) {
+    const LOG_HEADER = 'setClientSidePeerEventHandlers';
     socket.on('message', (message) => {
       const parsedMessage = JSON.parse(message);
       const dataProtoVer = _.get(parsedMessage, 'dataProtoVer');
@@ -442,7 +459,7 @@ class P2pClient {
         const socket = new Websocket(peerInfo.url);
         socket.on('open', async () => {
           logger.info(`Connected to peer(${peerInfo.url}),`);
-          this.setPeerEventHandlers(socket);
+          this.setClientSidePeerEventHandlers(socket);
           this.sendAddress(socket);
           await this.waitForAddress(socket);
           this.requestChainSegment(socket, this.server.node.bc.lastBlockNumber());
diff --git a/p2p/server.js b/p2p/server.js
index 41f736e37..794791a3f 100644
--- a/p2p/server.js
+++ b/p2p/server.js
@@ -102,7 +102,7 @@ class P2pServer {
     // Set the number of maximum clients.
     this.wsServer.setMaxListeners(this.maxInbound);
     this.wsServer.on('connection', (socket) => {
-      this.setPeerEventHandlers(socket);
+      this.setServerSidePeerEventHandlers(socket);
     });
     logger.info(`Listening to peer-to-peer connections on: ${P2P_PORT}\n`);
     await this.setUpIpAddresses();
@@ -166,7 +166,7 @@ class P2pServer {
       address: this.getNodeAddress(),
       state: this.node.state,
       stateNumeric: Object.keys(BlockchainNodeStates).indexOf(this.node.state),
-      nonce: this.node.nonce,
+      nonce: this.node.getNonce(),
       dbStatus: {
         stateInfo: this.node.db.getStateInfo('/'),
         stateProof: this.node.db.getStateProof('/'),
@@ -175,17 +175,6 @@ class P2pServer {
     };
   }
 
-  getDiskUsage() {
-    try {
-      const diskUsage = disk.checkSync(DISK_USAGE_PATH);
-      const used = _.get(diskUsage, 'total', 0) - _.get(diskUsage, 'free', 0);
-      return Object.assign({}, diskUsage, { used });
-    } catch (err) {
-      logger.error(`Error: ${err} ${err.stack}`);
-      return {};
-    }
-  }
-
   getCpuUsage() {
     const cores = os.cpus();
     let free = 0;
@@ -198,9 +187,11 @@ class P2pServer {
       total += allTimes;
     }
     const usage = total - free;
+    const usagePercent = total ? usage / total * 100 : 0;
     return {
       free,
       usage,
+      usagePercent,
       total
     };
   }
@@ -209,10 +200,12 @@ class P2pServer {
     const free = os.freemem();
     const total = os.totalmem();
     const usage = total - free;
+    const usagePercent = total ? usage / total * 100 : 0;
     return {
       os: {
         free,
         usage,
+        usagePercent,
         total,
       },
       heap: process.memoryUsage(),
@@ -220,6 +213,20 @@ class P2pServer {
     };
   }
 
+  getDiskUsage() {
+    try {
+      const diskUsage = disk.checkSync(DISK_USAGE_PATH);
+      const free =  _.get(diskUsage, 'free', 0);
+      const total = _.get(diskUsage, 'total', 0);
+      const usage = total - free;
+      const usagePercent = total ? usage / total * 100 : 0;
+      return Object.assign({}, diskUsage, { usage, usagePercent });
+    } catch (err) {
+      logger.error(`Error: ${err} ${err.stack}`);
+      return {};
+    }
+  }
+
   getRuntimeInfo() {
     return {
       process: {
@@ -241,6 +248,7 @@ class P2pServer {
         NETWORK_OPTIMIZATION: process.env.NETWORK_OPTIMIZATION,
         GENESIS_CONFIGS_DIR: process.env.GENESIS_CONFIGS_DIR,
         MIN_NUM_VALIDATORS: process.env.MIN_NUM_VALIDATORS,
+        MAX_NUM_VALIDATORS: process.env.MAX_NUM_VALIDATORS,
         ACCOUNT_INDEX: process.env.ACCOUNT_INDEX,
         P2P_PORT: process.env.P2P_PORT,
         PORT: process.env.PORT,
@@ -345,8 +353,8 @@ class P2pServer {
     return 0;
   }
 
-  setPeerEventHandlers(socket) {
-    const LOG_HEADER = 'setPeerEventHandlers';
+  setServerSidePeerEventHandlers(socket) {
+    const LOG_HEADER = 'setServerSidePeerEventHandlers';
     socket.on('message', (message) => {
       try {
         const parsedMessage = JSON.parse(message);
@@ -432,6 +440,9 @@ class P2pServer {
               this.consensus.handleConsensusMessage(consensusMessage);
             } else {
               logger.info(`\n [${LOG_HEADER}] Needs syncing...\n`);
+              Object.values(this.client.outbound).forEach((node) => {
+                this.client.requestChainSegment(node.socket, this.node.bc.lastBlock());
+              });
             }
             break;
           case MessageTypes.TRANSACTION:
@@ -601,11 +612,14 @@ class P2pServer {
     if (this.node.isShardReporter && this.node.bc.lastBlockNumber() === 0) {
       logger.info(`Setting up sharding..`);
       await this.setUpDbForSharding();
+      return true;
     }
+    return false;
   }
 
   // TODO(platfowner): Set .shard config for functions, rules, and owners as well.
   async setUpDbForSharding() {
+    const LOG_HEADER = 'setUpDbForSharding';
     const parentChainEndpoint = GenesisSharding[ShardingProperties.PARENT_CHAIN_POC] + '/json-rpc';
     const ownerPrivateKey = CommonUtil.getJsObject(
         GenesisAccounts, [AccountProperties.OWNER, AccountProperties.PRIVATE_KEY]);
@@ -620,13 +634,14 @@ class P2pServer {
       throw Error(`Shard owner (${shardOwner}) doesn't have the permission to create a shard (${appName})`);
     }
     if (shardingAppConfig === null) {
-      // Create app first. Note that the app should have staked some AIN.
+      // Create app first.
       const shardAppCreateTxBody = P2pServer.buildShardAppCreateTxBody(appName);
       await sendTxAndWaitForFinalization(parentChainEndpoint, shardAppCreateTxBody, ownerPrivateKey);
     }
+    logger.info(`[${LOG_HEADER}] shard app created`);
     const shardInitTxBody = P2pServer.buildShardingSetupTxBody();
     await sendTxAndWaitForFinalization(parentChainEndpoint, shardInitTxBody, ownerPrivateKey);
-    logger.info(`setUpDbForSharding success`);
+    logger.info(`[${LOG_HEADER}] shard set up success`);
   }
 
   static async getShardingAppConfig(parentChainEndpoint, appName) {
@@ -639,6 +654,7 @@ class P2pServer {
 
   static buildShardAppCreateTxBody(appName) {
     const shardOwner = GenesisSharding[ShardingProperties.SHARD_OWNER];
+    const shardReporter = GenesisSharding[ShardingProperties.SHARD_REPORTER];
     const timestamp = Date.now();
     return {
       operation: {
@@ -646,7 +662,8 @@ class P2pServer {
         ref: PathUtil.getCreateAppRecordPath(appName, timestamp),
         value: {
           [PredefinedDbPaths.MANAGE_APP_CONFIG_ADMIN]: {
-            [shardOwner]: true
+            [shardOwner]: true,
+            [shardReporter]: true,
           }
         }
       },
@@ -662,10 +679,10 @@ class P2pServer {
     const proofHashRulesLight = `auth.addr === '${shardReporter}'`;
     const proofHashRules = `auth.addr === '${shardReporter}' && ` +
         '((newData === null && ' +
-        `Number($block_number) < (getValue('${shardingPath}/${ShardingProperties.SHARD}/` +
+        `Number($block_number) < (getValue('${shardingPath}/${PredefinedDbPaths.DOT_SHARD}/` +
             `${ShardingProperties.PROOF_HASH_MAP}/latest') || 0)) || ` +
         '(newData !== null && ($block_number === "0" || ' +
-        `$block_number === String((getValue('${shardingPath}/${ShardingProperties.SHARD}/` +
+        `$block_number === String((getValue('${shardingPath}/${PredefinedDbPaths.DOT_SHARD}/` +
             `${ShardingProperties.PROOF_HASH_MAP}/latest') || 0) + 1))))`;
     const latestBlockNumberRules = `auth.fid === '${NativeFunctionIds.UPDATE_LATEST_SHARD_REPORT}'`;
     return {
@@ -676,35 +693,39 @@ class P2pServer {
             type: WriteDbOperations.SET_RULE,
             ref: CommonUtil.appendPath(
                 shardingPath,
-                ShardingProperties.SHARD,
+                PredefinedDbPaths.DOT_SHARD,
                 ShardingProperties.PROOF_HASH_MAP,
                 '$block_number',
                 ShardingProperties.PROOF_HASH),
             value: {
-              [RuleProperties.WRITE]: LIGHTWEIGHT ? proofHashRulesLight : proofHashRules
+              [PredefinedDbPaths.DOT_RULE]: {
+                [RuleProperties.WRITE]: LIGHTWEIGHT ? proofHashRulesLight : proofHashRules
+              }
             }
           },
           {
             type: WriteDbOperations.SET_RULE,
             ref: CommonUtil.appendPath(
                 shardingPath,
-                ShardingProperties.SHARD,
+                PredefinedDbPaths.DOT_SHARD,
                 ShardingProperties.PROOF_HASH_MAP,
                 ShardingProperties.LATEST),
             value: {
-              [RuleProperties.WRITE]: latestBlockNumberRules
+              [PredefinedDbPaths.DOT_RULE]: {
+                [RuleProperties.WRITE]: latestBlockNumberRules
+              }
             }
           },
           {
             type: WriteDbOperations.SET_FUNCTION,
             ref: CommonUtil.appendPath(
                 shardingPath,
-                ShardingProperties.SHARD,
+                PredefinedDbPaths.DOT_SHARD,
                 ShardingProperties.PROOF_HASH_MAP,
                 '$block_number',
                 ShardingProperties.PROOF_HASH),
             value: {
-              [FunctionProperties.FUNCTION]: {
+              [PredefinedDbPaths.DOT_FUNCTION]: {
                 [NativeFunctionIds.UPDATE_LATEST_SHARD_REPORT]: {
                   [FunctionProperties.FUNCTION_TYPE]: FunctionTypes.NATIVE,
                   [FunctionProperties.FUNCTION_ID]: NativeFunctionIds.UPDATE_LATEST_SHARD_REPORT
@@ -716,7 +737,7 @@ class P2pServer {
             type: WriteDbOperations.SET_VALUE,
             ref: shardingPath,
             value: {
-              [ShardingProperties.SHARD]: {
+              [PredefinedDbPaths.DOT_SHARD]: {
                 [ShardingProperties.SHARDING_ENABLED]: true,
                 [ShardingProperties.PROOF_HASH_MAP]: {
                   [ShardingProperties.LATEST]: -1,
diff --git a/package.json b/package.json
index 019920e3a..52a24ddb8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ain-blockchain",
   "description": "AI Network Blockchain",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "private": true,
   "license": "MIT",
   "author": "dev@ainetwork.ai",
@@ -13,24 +13,32 @@
     "node": ">=12"
   },
   "scripts": {
-    "clean": "sh stop_servers.sh & echo 'cleaned'",
-    "tracker": "npm run clean & node ./tracker-server/index.js",
+    "clean": "sh stop_servers_local.sh & echo 'cleaned'",
     "client": "ACCOUNT_INDEX=0 DEBUG=true node ./client/index.js",
-    "test_common_util": "./node_modules/mocha/bin/mocha --timeout 160000 unittest/common-util.test.js",
-    "test_state_util": "./node_modules/mocha/bin/mocha --timeout 160000 unittest/state-util.test.js",
-    "test_block_pool": "MIN_NUM_VALIDATORS=1 ./node_modules/mocha/bin/mocha --timeout 160000 unittest/block-pool.test.js",
-    "test_db": "MIN_NUM_VALIDATORS=1 ./node_modules/mocha/bin/mocha --timeout 160000 unittest/db.test.js",
-    "test_tx_pool": "MIN_NUM_VALIDATORS=1 ./node_modules/mocha/bin/mocha --timeout 160000 unittest/tx-pool.test.js",
-    "test_p2p_util": "./node_modules/mocha/bin/mocha --timeout 160000 unittest/p2p-util.test.js",
-    "test_p2p": "./node_modules/mocha/bin/mocha --timeout 320000 unittest/p2p.test.js",
-    "test_unit": "MIN_NUM_VALIDATORS=1 ./node_modules/mocha/bin/mocha --timeout 160000 \"unittest/*.test.js\"",
-    "test_node": "./node_modules/mocha/bin/mocha --timeout 160000 integration/node.test.js",
-    "test_blockchain": "./node_modules/mocha/bin/mocha --timeout 160000 integration/blockchain.test.js",
-    "test_dapp": "./node_modules/mocha/bin/mocha --timeout 160000 integration/afan_dapp.test.js",
-    "test_sharding": "./node_modules/mocha/bin/mocha --timeout 320000 integration/sharding.test.js",
-    "test_integration": "./node_modules/mocha/bin/mocha --timeout 640000 \"integration/*.test.js\"",
+    "lint": "eslint --ext js -c .eslintrc.json .",
     "loadtest": "sh loadtest/load_tester.sh",
-    "lint": "eslint --ext js -c .eslintrc.json ."
+    "test_integration": "./node_modules/mocha/bin/mocha --timeout 640000 \"integration/*.test.js\"",
+    "test_integration_blockchain": "./node_modules/mocha/bin/mocha --timeout 160000 integration/blockchain.test.js",
+    "test_integration_consensus": "./node_modules/mocha/bin/mocha --timeout 160000 integration/consensus.test.js",
+    "test_integration_dapp": "./node_modules/mocha/bin/mocha --timeout 160000 integration/afan_dapp.test.js",
+    "test_integration_node": "./node_modules/mocha/bin/mocha --timeout 640000 integration/node.test.js",
+    "test_integration_sharding": "./node_modules/mocha/bin/mocha --timeout 320000 integration/sharding.test.js",
+    "test_unit": "MIN_NUM_VALIDATORS=1 STATE_TREE_BYTES_LIMIT=20000000 ./node_modules/mocha/bin/mocha --timeout 160000 \"unittest/*.test.js\"",
+    "test_unit_block_pool": "MIN_NUM_VALIDATORS=1 ./node_modules/mocha/bin/mocha --timeout 160000 unittest/block-pool.test.js",
+    "test_unit_blockchain": "MIN_NUM_VALIDATORS=1 ./node_modules/mocha/bin/mocha --timeout 160000 unittest/blockchain.test.js",
+    "test_unit_common_util": "./node_modules/mocha/bin/mocha --timeout 160000 unittest/common-util.test.js",
+    "test_unit_consensus": "MIN_NUM_VALIDATORS=1 ./node_modules/mocha/bin/mocha --timeout 160000 unittest/consensus.test.js",
+    "test_unit_db": "MIN_NUM_VALIDATORS=1 STATE_TREE_BYTES_LIMIT=20000000 ./node_modules/mocha/bin/mocha --timeout 160000 unittest/db.test.js",
+    "test_unit_functions": "MIN_NUM_VALIDATORS=1 ./node_modules/mocha/bin/mocha --timeout 160000 unittest/functions.test.js",
+    "test_unit_p2p": "./node_modules/mocha/bin/mocha --timeout 320000 unittest/p2p.test.js",
+    "test_unit_p2p_util": "./node_modules/mocha/bin/mocha --timeout 160000 unittest/p2p-util.test.js",
+    "test_unit_rule_util": "./node_modules/mocha/bin/mocha --timeout 160000 unittest/rule-util.test.js",
+    "test_unit_state_manager": "./node_modules/mocha/bin/mocha --timeout 160000 unittest/state-manager.test.js",
+    "test_unit_state_node": "./node_modules/mocha/bin/mocha --timeout 160000 unittest/state-node.test.js",
+    "test_unit_state_util": "./node_modules/mocha/bin/mocha --timeout 160000 unittest/state-util.test.js",
+    "test_unit_tx": "MIN_NUM_VALIDATORS=1 ./node_modules/mocha/bin/mocha --timeout 160000 unittest/transaction.test.js",
+    "test_unit_tx_pool": "MIN_NUM_VALIDATORS=1 ./node_modules/mocha/bin/mocha --timeout 160000 unittest/tx-pool.test.js",
+    "tracker": "npm run clean & node ./tracker-server/index.js"
   },
   "dependencies": {
     "@ainblockchain/ain-util": "^1.1.6",
diff --git a/reset_blockchain_gcp.sh b/reset_blockchain_gcp.sh
index 39580aa81..d4ab9363b 100644
--- a/reset_blockchain_gcp.sh
+++ b/reset_blockchain_gcp.sh
@@ -1,13 +1,13 @@
 #!/bin/sh
 
-if [ "$#" -lt 3 ]; then
+if [[ "$#" -lt 3 ]]; then
     echo "Usage: sh reset_blockchain_gcp.sh dev lia 0"
     exit
 fi
 
-if [ "$1" = 'spring' ] || [ "$1" = 'summer' ] || [ "$1" = 'dev' ] || [ "$1" = 'staging' ]; then
+if [[ "$1" = 'spring' ]] || [[ "$1" = 'summer' ]] || [[ "$1" = 'dev' ]] || [[ "$1" = 'staging' ]]; then
     SEASON="$1"
-    if [ "$1" = 'spring' ] || [ "$1" = 'summer' ]; then
+    if [[ "$1" = 'spring' ]] || [[ "$1" = 'summer' ]]; then
         PROJECT_ID="testnet-prod-ground"
     else
         PROJECT_ID="testnet-$1-ground"
@@ -45,7 +45,7 @@ gcloud compute ssh $NODE_3_TARGET_ADDR --command "killall node" --project $PROJE
 gcloud compute ssh $NODE_4_TARGET_ADDR --command "killall node" --project $PROJECT_ID --zone $NODE_4_ZONE
 
 printf "\nStopping shard blockchains..."
-if [ "$3" -gt 0 ]; then
+if [[ "$3" -gt 0 ]]; then
     for i in $(seq $3)
         do
             echo "shard #$i"
@@ -64,22 +64,22 @@ fi
 
 # ssh into each instance, clean up, and start running the nodes
 printf "\n\n############################\n# Running parent tracker #\n############################\n\n"
-gcloud compute ssh $TRACKER_TARGET_ADDR --command "cd ../ain-blockchain && sudo rm -rf ./logs/ && sudo rm -rf /home/ain_blockchain_data/ && . start_tracker_gcp.sh" --project $PROJECT_ID --zone $TRACKER_ZONE
+gcloud compute ssh $TRACKER_TARGET_ADDR --command "cd ../ain-blockchain && sudo rm -rf ./logs/ && sudo rm -rf /home/ain_blockchain_data/ && . start_tracker_genesis_gcp.sh" --project $PROJECT_ID --zone $TRACKER_ZONE
 printf "\n\n###########################\n# Running parent node 0 #\n###########################\n\n"
-gcloud compute ssh $NODE_0_TARGET_ADDR --command "cd ../ain-blockchain && sudo rm -rf ./logs/ && sudo rm -rf /home/ain_blockchain_data/ && . start_node_gcp.sh $SEASON 0 0" --project $PROJECT_ID --zone $NODE_0_ZONE
+gcloud compute ssh $NODE_0_TARGET_ADDR --command "cd ../ain-blockchain && sudo rm -rf ./logs/ && sudo rm -rf /home/ain_blockchain_data/ && . start_node_genesis_gcp.sh $SEASON 0 0" --project $PROJECT_ID --zone $NODE_0_ZONE
 sleep 3
 printf "\n\n#########################\n# Running parent node 1 #\n#########################\n\n"
-gcloud compute ssh $NODE_1_TARGET_ADDR --command "cd ../ain-blockchain && sudo rm -rf ./logs/ && sudo rm -rf /home/ain_blockchain_data/ && . start_node_gcp.sh $SEASON 0 1" --project $PROJECT_ID --zone $NODE_1_ZONE
+gcloud compute ssh $NODE_1_TARGET_ADDR --command "cd ../ain-blockchain && sudo rm -rf ./logs/ && sudo rm -rf /home/ain_blockchain_data/ && . start_node_genesis_gcp.sh $SEASON 0 1" --project $PROJECT_ID --zone $NODE_1_ZONE
 printf "\n\n#########################\n# Running parent node 2 #\n#########################\n\n"
-gcloud compute ssh $NODE_2_TARGET_ADDR --command "cd ../ain-blockchain && sudo rm -rf ./logs/ && sudo rm -rf /home/ain_blockchain_data/ && . start_node_gcp.sh $SEASON 0 2" --project $PROJECT_ID --zone $NODE_2_ZONE
+gcloud compute ssh $NODE_2_TARGET_ADDR --command "cd ../ain-blockchain && sudo rm -rf ./logs/ && sudo rm -rf /home/ain_blockchain_data/ && . start_node_genesis_gcp.sh $SEASON 0 2" --project $PROJECT_ID --zone $NODE_2_ZONE
 printf "\n\n#########################\n# Running parent node 3 #\n#########################\n\n"
-gcloud compute ssh $NODE_3_TARGET_ADDR --command "cd ../ain-blockchain && sudo rm -rf ./logs/ && sudo rm -rf /home/ain_blockchain_data/ && . start_node_gcp.sh $SEASON 0 3" --project $PROJECT_ID --zone $NODE_3_ZONE
+gcloud compute ssh $NODE_3_TARGET_ADDR --command "cd ../ain-blockchain && sudo rm -rf ./logs/ && sudo rm -rf /home/ain_blockchain_data/ && . start_node_genesis_gcp.sh $SEASON 0 3" --project $PROJECT_ID --zone $NODE_3_ZONE
 printf "\n\n#########################\n# Running parent node 4 #\n#########################\n\n"
-gcloud compute ssh $NODE_4_TARGET_ADDR --command "cd ../ain-blockchain && sudo rm -rf ./logs/ && sudo rm -rf /home/ain_blockchain_data/ && . start_node_gcp.sh $SEASON 0 4" --project $PROJECT_ID --zone $NODE_4_ZONE
+gcloud compute ssh $NODE_4_TARGET_ADDR --command "cd ../ain-blockchain && sudo rm -rf ./logs/ && sudo rm -rf /home/ain_blockchain_data/ && . start_node_genesis_gcp.sh $SEASON 0 4" --project $PROJECT_ID --zone $NODE_4_ZONE
 
 sleep 10
 
-if [ "$3" -gt 0 ]; then
+if [[ "$3" -gt 0 ]]; then
     for i in $(seq $3)
         do
             echo "shard #$i"
@@ -92,13 +92,13 @@ if [ "$3" -gt 0 ]; then
 
             # ssh into each instance, clean up, and start running the nodes
             printf "\n\n###########################\n# Running shard_$i tracker #\n###########################\n\n"
-            gcloud compute ssh $SHARD_TRACKER_TARGET_ADDR --command "cd ../ain-blockchain && sudo rm -rf ./logs/ && sudo rm -rf /home/ain_blockchain_data/ && . start_tracker_gcp.sh" --project $PROJECT_ID --zone $TRACKER_ZONE
+            gcloud compute ssh $SHARD_TRACKER_TARGET_ADDR --command "cd ../ain-blockchain && sudo rm -rf ./logs/ && sudo rm -rf /home/ain_blockchain_data/ && . start_tracker_genesis_gcp.sh" --project $PROJECT_ID --zone $TRACKER_ZONE
             printf "\n\n##########################\n# Running shard_$i node 0 #\n##########################\n\n"
-            gcloud compute ssh $SHARD_NODE_0_TARGET_ADDR --command "cd ../ain-blockchain && sudo rm -rf ./logs/ && sudo rm -rf /home/ain_blockchain_data/ && . start_node_gcp.sh $SEASON $i 0" --project $PROJECT_ID --zone $NODE_0_ZONE
+            gcloud compute ssh $SHARD_NODE_0_TARGET_ADDR --command "cd ../ain-blockchain && sudo rm -rf ./logs/ && sudo rm -rf /home/ain_blockchain_data/ && . start_node_genesis_gcp.sh $SEASON $i 0" --project $PROJECT_ID --zone $NODE_0_ZONE
             sleep 3
             printf "\n\n##########################\n# Running shard_$i node 1 #\n##########################\n\n"
-            gcloud compute ssh $SHARD_NODE_1_TARGET_ADDR --command "cd ../ain-blockchain && sudo rm -rf ./logs/ && sudo rm -rf /home/ain_blockchain_data/ && . start_node_gcp.sh $SEASON $i 1" --project $PROJECT_ID --zone $NODE_1_ZONE
+            gcloud compute ssh $SHARD_NODE_1_TARGET_ADDR --command "cd ../ain-blockchain && sudo rm -rf ./logs/ && sudo rm -rf /home/ain_blockchain_data/ && . start_node_genesis_gcp.sh $SEASON $i 1" --project $PROJECT_ID --zone $NODE_1_ZONE
             printf "\n\n##########################\n# Running shard_$i node 2 #\n##########################\n\n"
-            gcloud compute ssh $SHARD_NODE_2_TARGET_ADDR --command "cd ../ain-blockchain && sudo rm -rf ./logs/ && sudo rm -rf /home/ain_blockchain_data/ && . start_node_gcp.sh $SEASON $i 2" --project $PROJECT_ID --zone $NODE_2_ZONE
+            gcloud compute ssh $SHARD_NODE_2_TARGET_ADDR --command "cd ../ain-blockchain && sudo rm -rf ./logs/ && sudo rm -rf /home/ain_blockchain_data/ && . start_node_genesis_gcp.sh $SEASON $i 2" --project $PROJECT_ID --zone $NODE_2_ZONE
         done
 fi
diff --git a/setup_blockchain_ubuntu.sh b/setup_blockchain_ubuntu.sh
index 86ca40795..ef34718e8 100644
--- a/setup_blockchain_ubuntu.sh
+++ b/setup_blockchain_ubuntu.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-echo 'Installing nodejs..'
+echo 'Installing NodeJS..'
 sudo apt update
 curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash -
 sudo apt install -y nodejs
diff --git a/setup_monitoring_gcp.sh b/setup_monitoring_gcp.sh
index 43cea5ab1..27cec41cf 100644
--- a/setup_monitoring_gcp.sh
+++ b/setup_monitoring_gcp.sh
@@ -1,12 +1,12 @@
 #!/bin/sh
 
-if [ "$#" -lt 1 ]; then
+if [[ "$#" -lt 1 ]]; then
     echo "Usage: sh setup_monitoring_gcp.sh [dev|staging|spring|summer]"
     echo "Example: sh setup_monitoring_gcp.sh dev"
     exit
 fi
 
-if [ "$1" != 'spring' ] && [ "$1" != 'summer' ] && [ "$1" != 'dev' ] && [ "$1" != 'staging' ]; then
+if [[ "$1" != 'spring' ]] && [[ "$1" != 'summer' ]] && [[ "$1" != 'dev' ]] && [[ "$1" != 'staging' ]]; then
     echo "Invalid season argument: $1"
     exit
 fi
diff --git a/setup_monitoring_ubuntu.sh b/setup_monitoring_ubuntu.sh
index 951094c52..edb4b7090 100644
--- a/setup_monitoring_ubuntu.sh
+++ b/setup_monitoring_ubuntu.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-echo 'Installing nodejs..'
+echo 'Installing NodeJS..'
 sudo apt update
 curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash -
 sudo apt install -y nodejs
diff --git a/setup_node_gcp.sh b/setup_node_gcp.sh
deleted file mode 100644
index 4915bf23d..000000000
--- a/setup_node_gcp.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-echo 'Killing old jobs..'
-sudo killall node
-
-echo 'Setting up working directory..'
-cd
-sudo rm -rf /home/ain_blockchain_data
-sudo mkdir /home/ain_blockchain_data
-sudo chmod 777 /home/ain_blockchain_data
-sudo rm -rf ../ain-blockchain*
-sudo mkdir ../ain-blockchain
-sudo chmod 777 ../ain-blockchain
-mv * ../ain-blockchain
-cd ../ain-blockchain
-
-echo 'Installing node modules..'
-npm install
\ No newline at end of file
diff --git a/start_node_gcp.sh b/start_node_genesis_gcp.sh
similarity index 59%
rename from start_node_gcp.sh
rename to start_node_genesis_gcp.sh
index 725f80dd7..590842239 100644
--- a/start_node_gcp.sh
+++ b/start_node_genesis_gcp.sh
@@ -1,64 +1,83 @@
 #!/bin/sh
 
-if [ "$#" -lt 2 ]; then
-    echo "Usage: sh start_node_gcp.sh [dev|staging|spring|summer] <Shard Index> <Node Index>"
-    echo "Example: sh start_node_gcp.sh spring 0 0"
+if [[ "$#" -lt 2 ]]; then
+    echo "Usage: sh start_node_genesis_gcp.sh [dev|staging|spring|summer] <Shard Index> <Node Index>"
+    echo "Example: sh start_node_genesis_gcp.sh spring 0 0"
     exit
 fi
 
+
+echo 'Killing old jobs..'
+sudo killall node
+
+
+echo 'Setting up working directory..'
+cd
+sudo rm -rf /home/ain_blockchain_data
+sudo mkdir /home/ain_blockchain_data
+sudo chmod 777 /home/ain_blockchain_data
+sudo rm -rf ../ain-blockchain*
+sudo mkdir ../ain-blockchain
+sudo chmod 777 ../ain-blockchain
+mv * ../ain-blockchain
+cd ../ain-blockchain
+
+
+echo 'Installing node modules..'
+npm install
 export GENESIS_CONFIGS_DIR=genesis-configs/testnet
-if [ "$1" = 'spring' ]; then
+if [[ "$1" = 'spring' ]]; then
     export TRACKER_WS_ADDR=ws://35.221.137.80:5000
-elif [ "$1" = 'summer' ]; then
+elif [[ "$1" = 'summer' ]]; then
     export TRACKER_WS_ADDR=ws://35.194.172.106:5000
-elif [ "$1" = 'staging' ]; then
+elif [[ "$1" = 'staging' ]]; then
     export TRACKER_WS_ADDR=ws://35.221.150.73:5000
-elif [ "$1" = 'dev' ]; then
-  if [ "$2" -gt 0 ]; then
+elif [[ "$1" = 'dev' ]]; then
+  if [[ "$2" -gt 0 ]]; then
     export GENESIS_CONFIGS_DIR=genesis-configs/sim-shard
   fi
 
-  if [ "$2" = 0 ]; then
+  if [[ "$2" = 0 ]]; then
     export TRACKER_WS_ADDR=ws://34.80.184.73:5000  # dev-tracker-ip
-  elif [ "$2" = 1 ]; then
+  elif [[ "$2" = 1 ]]; then
     export TRACKER_WS_ADDR=ws://35.187.153.22:5000  # dev-shard-1-tracker-ip
-  elif [ "$2" = 2 ]; then
+  elif [[ "$2" = 2 ]]; then
     export TRACKER_WS_ADDR=ws://34.80.203.104:5000  # dev-shard-2-tracker-ip
-  elif [ "$2" = 3 ]; then
+  elif [[ "$2" = 3 ]]; then
     export TRACKER_WS_ADDR=ws://35.189.174.17:5000  # dev-shard-3-tracker-ip
-  elif [ "$2" = 4 ]; then
+  elif [[ "$2" = 4 ]]; then
     export TRACKER_WS_ADDR=ws://35.221.164.158:5000  # dev-shard-4-tracker-ip
-  elif [ "$2" = 5 ]; then
+  elif [[ "$2" = 5 ]]; then
     export TRACKER_WS_ADDR=ws://35.234.46.65:5000  # dev-shard-5-tracker-ip
-  elif [ "$2" = 6 ]; then
+  elif [[ "$2" = 6 ]]; then
     export TRACKER_WS_ADDR=ws://35.221.210.171:5000  # dev-shard-6-tracker-ip
-  elif [ "$2" = 7 ]; then
+  elif [[ "$2" = 7 ]]; then
     export TRACKER_WS_ADDR=ws://34.80.222.121:5000  # dev-shard-7-tracker-ip
-  elif [ "$2" = 8 ]; then
+  elif [[ "$2" = 8 ]]; then
     export TRACKER_WS_ADDR=ws://35.221.200.95:5000  # dev-shard-8-tracker-ip
-  elif [ "$2" = 9 ]; then
+  elif [[ "$2" = 9 ]]; then
     export TRACKER_WS_ADDR=ws://34.80.216.199:5000  # dev-shard-9-tracker-ip
-  elif [ "$2" = 10 ]; then
+  elif [[ "$2" = 10 ]]; then
     export TRACKER_WS_ADDR=ws://34.80.161.85:5000  # dev-shard-10-tracker-ip
-  elif [ "$2" = 11 ]; then
+  elif [[ "$2" = 11 ]]; then
     export TRACKER_WS_ADDR=ws://35.194.239.169:5000  # dev-shard-11-tracker-ip
-  elif [ "$2" = 12 ]; then
+  elif [[ "$2" = 12 ]]; then
     export TRACKER_WS_ADDR=ws://35.185.156.22:5000  # dev-shard-12-tracker-ip
-  elif [ "$2" = 13 ]; then
+  elif [[ "$2" = 13 ]]; then
     export TRACKER_WS_ADDR=ws://35.229.247.143:5000  # dev-shard-13-tracker-ip
-  elif [ "$2" = 14 ]; then
+  elif [[ "$2" = 14 ]]; then
     export TRACKER_WS_ADDR=ws://35.229.226.47:5000  # dev-shard-14-tracker-ip
-  elif [ "$2" = 15 ]; then
+  elif [[ "$2" = 15 ]]; then
     export TRACKER_WS_ADDR=ws://35.234.61.23:5000  # dev-shard-15-tracker-ip
-  elif [ "$2" = 16 ]; then
+  elif [[ "$2" = 16 ]]; then
     export TRACKER_WS_ADDR=ws://34.80.66.41:5000  # dev-shard-16-tracker-ip
-  elif [ "$2" = 17 ]; then
+  elif [[ "$2" = 17 ]]; then
     export TRACKER_WS_ADDR=ws://35.229.143.18:5000  # dev-shard-17-tracker-ip
-  elif [ "$2" = 18 ]; then
+  elif [[ "$2" = 18 ]]; then
     export TRACKER_WS_ADDR=ws://35.234.58.137:5000  # dev-shard-18-tracker-ip
-  elif [ "$2" = 19 ]; then
+  elif [[ "$2" = 19 ]]; then
     export TRACKER_WS_ADDR=ws://34.80.249.104:5000  # dev-shard-19-tracker-ip
-  elif [ "$2" = 20 ]; then
+  elif [[ "$2" = 20 ]]; then
     export TRACKER_WS_ADDR=ws://35.201.248.92:5000  # dev-shard-20-tracker-ip
   else
     echo "Invalid shard ID argument: $2"
@@ -69,14 +88,14 @@ else
     exit
 fi
 
-if [ "$3" -lt 0 ] || [ "$3" -gt 4 ]; then
+echo "TRACKER_WS_ADDR=$TRACKER_WS_ADDR"
+echo "GENESIS_CONFIGS_DIR=$GENESIS_CONFIGS_DIR"
+
+if [[ "$3" -lt 0 ]] || [[ "$3" -gt 4 ]]; then
     echo "Invalid account_index argument: $2"
     exit
 fi
 
-echo "TRACKER_WS_ADDR=$TRACKER_WS_ADDR"
-echo "GENESIS_CONFIGS_DIR=$GENESIS_CONFIGS_DIR"
-
 export ACCOUNT_INDEX="$3"
 echo "ACCOUNT_INDEX=$ACCOUNT_INDEX"
 
@@ -88,6 +107,12 @@ export ENABLE_GAS_FEE_WORKAROUND=true
 export LIGHTWEIGHT=false
 export STAKE=100000
 export BLOCKCHAIN_DATA_DIR="/home/ain_blockchain_data"
+MAX_OLD_SPACE_SIZE_MB=6000
+
+printf "\nStarting up Blockchain Node server..\n\n"
+START_CMD="nohup node --async-stack-traces --max-old-space-size=$MAX_OLD_SPACE_SIZE_MB client/index.js >/dev/null 2>error_logs.txt &"
+printf "START_CMD='$START_CMD'\n"
+eval $START_CMD
+
 
-echo 'Starting up Node server..'
-nohup node --async-stack-traces client/index.js >/dev/null 2>error_logs.txt &
+printf "\nBlockchain Node server is now up!\n\n"
diff --git a/start_node_incremental_gcp.sh b/start_node_incremental_gcp.sh
index 97a9b0ab7..8f8c24657 100644
--- a/start_node_incremental_gcp.sh
+++ b/start_node_incremental_gcp.sh
@@ -1,67 +1,69 @@
 #!/bin/sh
 
-if [ "$#" -lt 2 ]; then
-    echo "Usage: sh start_node_incremental_gcp.sh [dev|staging|spring|summer] <Shard Index> <Node Index>"
-    echo "Example: sh start_node_incremental_gcp.sh spring 0 0"
+if [[ "$#" -lt 4 ]] || [[ "$#" -gt 4 ]]; then
+    printf "Usage: sh start_node_incremental_gcp.sh [dev|staging|spring|summer] <Shard Index> <Node Index> [fast|full]\n"
+    printf "Example: sh start_node_incremental_gcp.sh spring 0 0 fast\n"
     exit
 fi
 
 # 1. Configure env vars (GENESIS_CONFIGS_DIR, TRACKER_WS_ADDR, ACCOUNT_INDEX, ...)
+printf "\n#### [Step 1] Configure env vars ####\n\n"
+
 export GENESIS_CONFIGS_DIR=genesis-configs/testnet
-if [ "$1" = 'spring' ]; then
+if [[ "$1" = 'spring' ]]; then
     export TRACKER_WS_ADDR=ws://35.221.137.80:5000
-elif [ "$1" = 'summer' ]; then
+elif [[ "$1" = 'summer' ]]; then
     export TRACKER_WS_ADDR=ws://35.194.172.106:5000
-elif [ "$1" = 'staging' ]; then
+elif [[ "$1" = 'staging' ]]; then
     export TRACKER_WS_ADDR=ws://35.221.150.73:5000
-elif [ "$1" = 'dev' ]; then
-    if [ "$2" = 0 ]; then
+elif [[ "$1" = 'dev' ]]; then
+    if [[ "$2" = 0 ]]; then
         export TRACKER_WS_ADDR=ws://34.80.184.73:5000  # dev-tracker-ip
-    elif [ "$2" = 1 ]; then
+    elif [[ "$2" = 1 ]]; then
         export TRACKER_WS_ADDR=ws://35.187.153.22:5000  # dev-shard-1-tracker-ip
-    elif [ "$2" = 2 ]; then
+    elif [[ "$2" = 2 ]]; then
         export TRACKER_WS_ADDR=ws://34.80.203.104:5000  # dev-shard-2-tracker-ip
-    elif [ "$2" = 3 ]; then
+    elif [[ "$2" = 3 ]]; then
         export TRACKER_WS_ADDR=ws://35.189.174.17:5000  # dev-shard-3-tracker-ip
-    elif [ "$2" = 4 ]; then
+    elif [[ "$2" = 4 ]]; then
         export TRACKER_WS_ADDR=ws://35.221.164.158:5000  # dev-shard-4-tracker-ip
-    elif [ "$2" = 5 ]; then
+    elif [[ "$2" = 5 ]]; then
         export TRACKER_WS_ADDR=ws://35.234.46.65:5000  # dev-shard-5-tracker-ip
-    elif [ "$2" = 6 ]; then
+    elif [[ "$2" = 6 ]]; then
         export TRACKER_WS_ADDR=ws://35.221.210.171:5000  # dev-shard-6-tracker-ip
-    elif [ "$2" = 7 ]; then
+    elif [[ "$2" = 7 ]]; then
         export TRACKER_WS_ADDR=ws://34.80.222.121:5000  # dev-shard-7-tracker-ip
-    elif [ "$2" = 8 ]; then
+    elif [[ "$2" = 8 ]]; then
         export TRACKER_WS_ADDR=ws://35.221.200.95:5000  # dev-shard-8-tracker-ip
-    elif [ "$2" = 9 ]; then
+    elif [[ "$2" = 9 ]]; then
         export TRACKER_WS_ADDR=ws://34.80.216.199:5000  # dev-shard-9-tracker-ip
-    elif [ "$2" = 10 ]; then
+    elif [[ "$2" = 10 ]]; then
         export TRACKER_WS_ADDR=ws://34.80.161.85:5000  # dev-shard-10-tracker-ip
-    elif [ "$2" = 11 ]; then
+    elif [[ "$2" = 11 ]]; then
         export TRACKER_WS_ADDR=ws://35.194.239.169:5000  # dev-shard-11-tracker-ip
-    elif [ "$2" = 12 ]; then
+    elif [[ "$2" = 12 ]]; then
         export TRACKER_WS_ADDR=ws://35.185.156.22:5000  # dev-shard-12-tracker-ip
-    elif [ "$2" = 13 ]; then
+    elif [[ "$2" = 13 ]]; then
         export TRACKER_WS_ADDR=ws://35.229.247.143:5000  # dev-shard-13-tracker-ip
-    elif [ "$2" = 14 ]; then
+    elif [[ "$2" = 14 ]]; then
         export TRACKER_WS_ADDR=ws://35.229.226.47:5000  # dev-shard-14-tracker-ip
-    elif [ "$2" = 15 ]; then
+    elif [[ "$2" = 15 ]]; then
         export TRACKER_WS_ADDR=ws://35.234.61.23:5000  # dev-shard-15-tracker-ip
-    elif [ "$2" = 16 ]; then
+    elif [[ "$2" = 16 ]]; then
         export TRACKER_WS_ADDR=ws://34.80.66.41:5000  # dev-shard-16-tracker-ip
-    elif [ "$2" = 17 ]; then
+    elif [[ "$2" = 17 ]]; then
         export TRACKER_WS_ADDR=ws://35.229.143.18:5000  # dev-shard-17-tracker-ip
-    elif [ "$2" = 18 ]; then
+    elif [[ "$2" = 18 ]]; then
         export TRACKER_WS_ADDR=ws://35.234.58.137:5000  # dev-shard-18-tracker-ip
-    elif [ "$2" = 19 ]; then
+    elif [[ "$2" = 19 ]]; then
         export TRACKER_WS_ADDR=ws://34.80.249.104:5000  # dev-shard-19-tracker-ip
-    elif [ "$2" = 20 ]; then
+    elif [[ "$2" = 20 ]]; then
         export TRACKER_WS_ADDR=ws://35.201.248.92:5000  # dev-shard-20-tracker-ip
     else
-        echo "Invalid shard ID argument: $2"
+        printf "Invalid <Shard Index> argument: $2\n"
         exit
     fi
-    if [ "$2" -gt 0 ]; then
+    if [[ "$2" -gt 0 ]]; then
         # Create a genesis_params.json
         export GENESIS_CONFIGS_DIR="genesis-configs/shard_$2"
         mkdir -p "./$GENESIS_CONFIGS_DIR"
@@ -73,20 +75,28 @@ elif [ "$1" = 'dev' ]; then
 EOF
     fi
 else
-    echo "Invalid season argument: $1"
+    printf "Invalid <Project/Season> argument: $1\n"
     exit
 fi
 
-if [ "$3" -lt 0 ] || [ "$3" -gt 4 ]; then
-    echo "Invalid account_index argument: $2"
+printf "TRACKER_WS_ADDR=$TRACKER_WS_ADDR\n"
+printf "GENESIS_CONFIGS_DIR=$GENESIS_CONFIGS_DIR\n"
+
+if [[ "$3" -lt 0 ]] || [[ "$3" -gt 4 ]]; then
+    printf "Invalid <Node Index> argument: $3\n"
     exit
 fi
 
-echo "TRACKER_WS_ADDR=$TRACKER_WS_ADDR"
-echo "GENESIS_CONFIGS_DIR=$GENESIS_CONFIGS_DIR"
-
 export ACCOUNT_INDEX="$3"
-echo "ACCOUNT_INDEX=$ACCOUNT_INDEX"
+printf "ACCOUNT_INDEX=$ACCOUNT_INDEX\n"
+
+if [[ "$4" != 'fast' ]] && [[ "$4" != 'full' ]]; then
+    printf "Invalid <Sync Mode> argument: $2\n"
+    exit
+fi
+
+export SYNC_MODE="$4"
+printf "SYNC_MODE=$SYNC_MODE\n"
 
 export DEBUG=false
 export CONSOLE_LOG=false
@@ -98,56 +108,85 @@ export STAKE=100000
 export BLOCKCHAIN_DATA_DIR="/home/ain_blockchain_data"
 
 date=$(date '+%Y-%m-%dT%H:%M')
-echo "date=$date"
+printf "date=$date\n"
 NEW_DIR_PATH="../ain-blockchain-$date"
-echo "NEW_DIR_PATH=$NEW_DIR_PATH"
+printf "NEW_DIR_PATH=$NEW_DIR_PATH\n"
 
 # 2. Get currently used directory
+printf "\n#### [Step 2] Get currently used directory ####\n\n"
+
 OLD_DIR_PATH=$(find ../ain-blockchain* -maxdepth 0 -type d)
-echo "OLD_DIR_PATH=$OLD_DIR_PATH"
+printf "OLD_DIR_PATH=$OLD_DIR_PATH\n"
+
+# 3. Create a new directory
+printf "\n#### [Step 3] Create a new directory ####\n\n"
 
-# 3. Kill old node & remove old directory (but keep the chain data)
-sudo killall node
-sudo rm -rf ../ain-blockchain*
+MKDIR_CMD="sudo mkdir $NEW_DIR_PATH"
+printf "MKDIR_CMD=$MKDIR_CMD\n"
+eval $MKDIR_CMD
 
-# 4. Create a new directory
-sudo mkdir $NEW_DIR_PATH
 sudo chmod 777 $NEW_DIR_PATH
 mv * $NEW_DIR_PATH
 sudo mkdir -p $BLOCKCHAIN_DATA_DIR
 sudo chmod 777 $BLOCKCHAIN_DATA_DIR
 
-# 5. Install dependencies
+# 4. Install dependencies
+printf "\n#### [Step 4] Install dependencies ####\n\n"
+
 cd $NEW_DIR_PATH
 npm install
 
-# 6. Start a new node process
-printf "Starting up Node server.."
-nohup node --async-stack-traces client/index.js >/dev/null 2>error_logs.txt &
+# 5. Kill old node server 
+printf "\n#### [Step 5] Kill old node server ####\n\n"
+
+KILL_CMD="sudo killall node"
+printf "KILL_CMD='$KILL_CMD'\n\n"
+eval $KILL_CMD
+
+# 6. Start a new node server
+printf "\n#### [Step 6] Start new node server ####\n\n"
+
+sleep 10
+MAX_OLD_SPACE_SIZE_MB=6000
+
+START_CMD="nohup node --async-stack-traces --max-old-space-size=$MAX_OLD_SPACE_SIZE_MB client/index.js >/dev/null 2>error_logs.txt &"
+printf "START_CMD='$START_CMD'\n"
+eval $START_CMD
+
+# 7. Wait until the new node server catches up
+printf "\n#### [Step 7] Wait until the new node server catches up ####\n\n"
 
-# 7. Wait until the new node catches up
 SECONDS=0
 loopCount=0
 
 generate_post_data()
 {
   cat <<EOF
-  {"method":"$1","params":{"protoVer":"0.7.1"},"jsonrpc":"2.0","id":"1"}
+  {"method":"$1","params":{"protoVer":"0.8.0"},"jsonrpc":"2.0","id":"1"}
 EOF
 }
 
 while :
 do
-    consensusStatus=$(curl -X POST -H "Content-Type: application/json" --data "$(generate_post_data 'net_consensusStatus')" "http://localhost:8080/json-rpc" | jq -r '.result.result.state')
-    lastBlockNumber=$(curl -X POST -H "Content-Type: application/json" --data "$(generate_post_data 'ain_getRecentBlockNumber')" "http://localhost:8080/json-rpc" | jq -r '.result.result')
-    printf "\nconsensusStatus = ${consensusStatus}"
-    printf "\nlastBlockNumber = ${lastBlockNumber}"
-    if [ "$consensusStatus" == "RUNNING" ]; then
-        printf "\nNode is synced & running!"
-        printf "Time it took to sync in seconds: $SECONDS\n\n"
+    healthCheck=$(curl -m 20 -X GET -H "Content-Type: application/json" "http://localhost:8080/health_check")
+    printf "\nhealthCheck = ${healthCheck}\n"
+    lastBlockNumber=$(curl -m 20 -X POST -H "Content-Type: application/json" --data "$(generate_post_data 'ain_getRecentBlockNumber')" "http://localhost:8080/json-rpc" | jq -r '.result.result')
+    printf "\nlastBlockNumber = ${lastBlockNumber}\n"
+    if [[ "$healthCheck" = "true" ]]; then
+        printf "\nBlockchain Node server is synced & running!\n"
+        printf "\nTime it took to sync in seconds: $SECONDS\n"
         break
     fi
     ((loopCount++))
     printf "\nLoop count: ${loopCount}\n"
-    sleep 30
+    sleep 20
 done
+
+# 8. Remove old directory keeping the chain data
+printf "\n#### [Step 8] Remove old directory keeping the chain data ####\n\n"
+
+RM_CMD="sudo rm -rf $OLD_DIR_PATH"
+printf "RM_CMD='$RM_CMD'\n"
+eval $RM_CMD
+
+printf "\n* << Node server successfully deployed! ***************************************\n\n"
diff --git a/start_servers.sh b/start_servers.sh
deleted file mode 100755
index e4ec5be10..000000000
--- a/start_servers.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-# PARENT CHAIN
-node ./tracker-server/index.js &
-sleep 5
-MIN_NUM_VALIDATORS=5 ACCOUNT_INDEX=0 STAKE=100000 CONSOLE_LOG=true ENABLE_DEV_SET_CLIENT_API=true ENABLE_TX_SIG_VERIF_WORKAROUND=true ENABLE_GAS_FEE_WORKAROUND=true BLOCKCHAIN_DATA_DIR=~/ain_blockchain_data node ./client/index.js &
-sleep 10
-MIN_NUM_VALIDATORS=5 ACCOUNT_INDEX=1 STAKE=100000 CONSOLE_LOG=true ENABLE_DEV_SET_CLIENT_API=true ENABLE_TX_SIG_VERIF_WORKAROUND=true ENABLE_GAS_FEE_WORKAROUND=true BLOCKCHAIN_DATA_DIR=~/ain_blockchain_data node ./client/index.js &
-sleep 1
-MIN_NUM_VALIDATORS=5 ACCOUNT_INDEX=2 STAKE=100000 CONSOLE_LOG=true ENABLE_DEV_SET_CLIENT_API=true ENABLE_TX_SIG_VERIF_WORKAROUND=true ENABLE_GAS_FEE_WORKAROUND=true BLOCKCHAIN_DATA_DIR=~/ain_blockchain_data node ./client/index.js &
-sleep 10
-MIN_NUM_VALIDATORS=5 ACCOUNT_INDEX=3 STAKE=100000 CONSOLE_LOG=true ENABLE_DEV_SET_CLIENT_API=true ENABLE_TX_SIG_VERIF_WORKAROUND=true ENABLE_GAS_FEE_WORKAROUND=true BLOCKCHAIN_DATA_DIR=~/ain_blockchain_data node ./client/index.js &
-sleep 10
-MIN_NUM_VALIDATORS=5 ACCOUNT_INDEX=4 STAKE=100000 CONSOLE_LOG=true ENABLE_DEV_SET_CLIENT_API=true ENABLE_TX_SIG_VERIF_WORKAROUND=true ENABLE_GAS_FEE_WORKAROUND=true BLOCKCHAIN_DATA_DIR=~/ain_blockchain_data node ./client/index.js &
-sleep 10
-
-# CHILD CHAIN 1
-GENESIS_CONFIGS_DIR=genesis-configs/sim-shard PORT=9010 P2P_PORT=6010 node ./tracker-server/index.js &
-sleep 10
-GENESIS_CONFIGS_DIR=genesis-configs/sim-shard PORT=9011 P2P_PORT=6011 MIN_NUM_VALIDATORS=3 ACCOUNT_INDEX=0 STAKE=250 CONSOLE_LOG=true ENABLE_DEV_SET_CLIENT_API=true ENABLE_TX_SIG_VERIF_WORKAROUND=true ENABLE_GAS_FEE_WORKAROUND=true BLOCKCHAIN_DATA_DIR=~/ain_blockchain_data node ./client/index.js &
-sleep 10
-GENESIS_CONFIGS_DIR=genesis-configs/sim-shard PORT=9012 P2P_PORT=6012 MIN_NUM_VALIDATORS=3 ACCOUNT_INDEX=1 STAKE=250 CONSOLE_LOG=true ENABLE_DEV_SET_CLIENT_API=true ENABLE_TX_SIG_VERIF_WORKAROUND=true ENABLE_GAS_FEE_WORKAROUND=true BLOCKCHAIN_DATA_DIR=~/ain_blockchain_data node ./client/index.js &
-sleep 10
-GENESIS_CONFIGS_DIR=genesis-configs/sim-shard PORT=9013 P2P_PORT=6013 MIN_NUM_VALIDATORS=3 ACCOUNT_INDEX=2 STAKE=250 CONSOLE_LOG=true ENABLE_DEV_SET_CLIENT_API=true ENABLE_TX_SIG_VERIF_WORKAROUND=true ENABLE_GAS_FEE_WORKAROUND=true BLOCKCHAIN_DATA_DIR=~/ain_blockchain_data node ./client/index.js &
-sleep 10
-
-# CHILD CHAIN 2
-GENESIS_CONFIGS_DIR=genesis-configs/sim-shard PORT=9020 P2P_PORT=6020 node ./tracker-server/index.js &
-sleep 10
-GENESIS_CONFIGS_DIR=genesis-configs/sim-shard PORT=9021 P2P_PORT=6021 MIN_NUM_VALIDATORS=3 ACCOUNT_INDEX=0 TRACKER_WS_ADDR=ws://localhost:6020 STAKE=250 CONSOLE_LOG=true ENABLE_DEV_SET_CLIENT_API=true ENABLE_TX_SIG_VERIF_WORKAROUND=true ENABLE_GAS_FEE_WORKAROUND=true BLOCKCHAIN_DATA_DIR=~/ain_blockchain_data node ./client/index.js &
-sleep 10
-GENESIS_CONFIGS_DIR=genesis-configs/sim-shard PORT=9022 P2P_PORT=6022 MIN_NUM_VALIDATORS=3 ACCOUNT_INDEX=1 TRACKER_WS_ADDR=ws://localhost:6020 STAKE=250 CONSOLE_LOG=true ENABLE_DEV_SET_CLIENT_API=true ENABLE_TX_SIG_VERIF_WORKAROUND=true ENABLE_GAS_FEE_WORKAROUND=true BLOCKCHAIN_DATA_DIR=~/ain_blockchain_data node ./client/index.js &
-sleep 10
-GENESIS_CONFIGS_DIR=genesis-configs/sim-shard PORT=9023 P2P_PORT=6023 MIN_NUM_VALIDATORS=3 ACCOUNT_INDEX=2 TRACKER_WS_ADDR=ws://localhost:6020 STAKE=250 CONSOLE_LOG=true ENABLE_DEV_SET_CLIENT_API=true ENABLE_TX_SIG_VERIF_WORKAROUND=true ENABLE_GAS_FEE_WORKAROUND=true BLOCKCHAIN_DATA_DIR=~/ain_blockchain_data node ./client/index.js &
-sleep 10
diff --git a/start_servers_afan.sh b/start_servers_afan_local.sh
similarity index 65%
rename from start_servers_afan.sh
rename to start_servers_afan_local.sh
index 207e969ce..eb12b56c2 100755
--- a/start_servers_afan.sh
+++ b/start_servers_afan_local.sh
@@ -1,5 +1,5 @@
 # PARENT CHAIN
-CONSOLE_LOG=true node ./tracker-server/index.js &
+CONSOLE_LOG=true BLOCKCHAIN_DATA_DIR=~/ain_blockchain_data node ./tracker-server/index.js &
 sleep 5
 MIN_NUM_VALIDATORS=3 ACCOUNT_INDEX=0 CONSOLE_LOG=true ENABLE_DEV_SET_CLIENT_API=true ENABLE_TX_SIG_VERIF_WORKAROUND=true ENABLE_GAS_FEE_WORKAROUND=true BLOCKCHAIN_DATA_DIR=~/ain_blockchain_data node ./client/index.js &
 sleep 5
@@ -9,11 +9,23 @@ MIN_NUM_VALIDATORS=3 ACCOUNT_INDEX=2 CONSOLE_LOG=true ENABLE_DEV_SET_CLIENT_API=
 sleep 15
 
 # AFAN CHILD CHAIN
-GENESIS_CONFIGS_DIR=genesis-configs/afan-shard PORT=9010 P2P_PORT=6000 CONSOLE_LOG=true node ./tracker-server/index.js &
+GENESIS_CONFIGS_DIR=genesis-configs/afan-shard PORT=9000 P2P_PORT=6000 CONSOLE_LOG=true BLOCKCHAIN_DATA_DIR=~/ain_blockchain_data node ./tracker-server/index.js &
 sleep 5
-GENESIS_CONFIGS_DIR=genesis-configs/afan-shard PORT=9011 P2P_PORT=6001 MIN_NUM_VALIDATORS=3 ACCOUNT_INDEX=0 CONSOLE_LOG=true ENABLE_DEV_SET_CLIENT_API=true ENABLE_TX_SIG_VERIF_WORKAROUND=true ENABLE_GAS_FEE_WORKAROUND=true BLOCKCHAIN_DATA_DIR=~/ain_blockchain_data node ./client/index.js &
+GENESIS_CONFIGS_DIR=genesis-configs/afan-shard PORT=9001 P2P_PORT=6001 MIN_NUM_VALIDATORS=3 ACCOUNT_INDEX=0 CONSOLE_LOG=true ENABLE_DEV_SET_CLIENT_API=true ENABLE_TX_SIG_VERIF_WORKAROUND=true ENABLE_GAS_FEE_WORKAROUND=true BLOCKCHAIN_DATA_DIR=~/ain_blockchain_data node ./client/index.js &
 sleep 5
-GENESIS_CONFIGS_DIR=genesis-configs/afan-shard PORT=9012 P2P_PORT=6002 MIN_NUM_VALIDATORS=3 ACCOUNT_INDEX=1 CONSOLE_LOG=true ENABLE_DEV_SET_CLIENT_API=true ENABLE_TX_SIG_VERIF_WORKAROUND=true ENABLE_GAS_FEE_WORKAROUND=true BLOCKCHAIN_DATA_DIR=~/ain_blockchain_data node ./client/index.js &
+
+while :
+do
+    nodeState=$(curl -m 20 -X GET -H "Content-Type: application/json" "http://localhost:9001/node_status" | jq -r '.result.state')
+    printf "\nnodeState = ${nodeState}\n"
+    if [[ "$nodeState" = "SERVING" ]]; then
+        printf "\nShard node 0 is now serving!\n"
+        break
+    fi
+    sleep 20
+done
+
+GENESIS_CONFIGS_DIR=genesis-configs/afan-shard PORT=9002 P2P_PORT=6002 MIN_NUM_VALIDATORS=3 ACCOUNT_INDEX=1 CONSOLE_LOG=true ENABLE_DEV_SET_CLIENT_API=true ENABLE_TX_SIG_VERIF_WORKAROUND=true ENABLE_GAS_FEE_WORKAROUND=true BLOCKCHAIN_DATA_DIR=~/ain_blockchain_data node ./client/index.js &
 sleep 5
-GENESIS_CONFIGS_DIR=genesis-configs/afan-shard PORT=9013 P2P_PORT=6003 MIN_NUM_VALIDATORS=3 ACCOUNT_INDEX=2 CONSOLE_LOG=true ENABLE_DEV_SET_CLIENT_API=true ENABLE_TX_SIG_VERIF_WORKAROUND=true ENABLE_GAS_FEE_WORKAROUND=true BLOCKCHAIN_DATA_DIR=~/ain_blockchain_data node ./client/index.js &
+GENESIS_CONFIGS_DIR=genesis-configs/afan-shard PORT=9003 P2P_PORT=6003 MIN_NUM_VALIDATORS=3 ACCOUNT_INDEX=2 CONSOLE_LOG=true ENABLE_DEV_SET_CLIENT_API=true ENABLE_TX_SIG_VERIF_WORKAROUND=true ENABLE_GAS_FEE_WORKAROUND=true BLOCKCHAIN_DATA_DIR=~/ain_blockchain_data node ./client/index.js &
 sleep 15
diff --git a/start_servers_local.sh b/start_servers_local.sh
new file mode 100755
index 000000000..3f0a76ca0
--- /dev/null
+++ b/start_servers_local.sh
@@ -0,0 +1,57 @@
+# PARENT CHAIN
+BLOCKCHAIN_DATA_DIR=~/ain_blockchain_data node ./tracker-server/index.js &
+sleep 5
+MIN_NUM_VALIDATORS=5 ACCOUNT_INDEX=0 STAKE=100000 CONSOLE_LOG=true ENABLE_DEV_SET_CLIENT_API=true ENABLE_TX_SIG_VERIF_WORKAROUND=true ENABLE_GAS_FEE_WORKAROUND=true BLOCKCHAIN_DATA_DIR=~/ain_blockchain_data node ./client/index.js &
+sleep 10
+MIN_NUM_VALIDATORS=5 ACCOUNT_INDEX=1 STAKE=100000 CONSOLE_LOG=true ENABLE_DEV_SET_CLIENT_API=true ENABLE_TX_SIG_VERIF_WORKAROUND=true ENABLE_GAS_FEE_WORKAROUND=true BLOCKCHAIN_DATA_DIR=~/ain_blockchain_data node ./client/index.js &
+sleep 10
+MIN_NUM_VALIDATORS=5 ACCOUNT_INDEX=2 STAKE=100000 CONSOLE_LOG=true ENABLE_DEV_SET_CLIENT_API=true ENABLE_TX_SIG_VERIF_WORKAROUND=true ENABLE_GAS_FEE_WORKAROUND=true BLOCKCHAIN_DATA_DIR=~/ain_blockchain_data node ./client/index.js &
+sleep 10
+MIN_NUM_VALIDATORS=5 ACCOUNT_INDEX=3 STAKE=100000 CONSOLE_LOG=true ENABLE_DEV_SET_CLIENT_API=true ENABLE_TX_SIG_VERIF_WORKAROUND=true ENABLE_GAS_FEE_WORKAROUND=true BLOCKCHAIN_DATA_DIR=~/ain_blockchain_data node ./client/index.js &
+sleep 10
+MIN_NUM_VALIDATORS=5 ACCOUNT_INDEX=4 STAKE=100000 CONSOLE_LOG=true ENABLE_DEV_SET_CLIENT_API=true ENABLE_TX_SIG_VERIF_WORKAROUND=true ENABLE_GAS_FEE_WORKAROUND=true BLOCKCHAIN_DATA_DIR=~/ain_blockchain_data node ./client/index.js &
+sleep 10
+
+# CHILD CHAIN 1
+GENESIS_CONFIGS_DIR=genesis-configs/afan-shard PORT=9000 P2P_PORT=6000 BLOCKCHAIN_DATA_DIR=~/ain_blockchain_data node ./tracker-server/index.js &
+sleep 10
+GENESIS_CONFIGS_DIR=genesis-configs/afan-shard PORT=9001 P2P_PORT=6001 MIN_NUM_VALIDATORS=3 ACCOUNT_INDEX=0 STAKE=100000 CONSOLE_LOG=true ENABLE_DEV_SET_CLIENT_API=true ENABLE_TX_SIG_VERIF_WORKAROUND=true ENABLE_GAS_FEE_WORKAROUND=true BLOCKCHAIN_DATA_DIR=~/ain_blockchain_data node ./client/index.js &
+sleep 10
+
+while :
+do
+    nodeState=$(curl -m 20 -X GET -H "Content-Type: application/json" "http://localhost:9001/node_status" | jq -r '.result.state')
+    printf "\nnodeState = ${nodeState}\n"
+    if [[ "$nodeState" = "SERVING" ]]; then
+        printf "\nShard node 0 is now serving!\n"
+        break
+    fi
+    sleep 20
+done
+
+GENESIS_CONFIGS_DIR=genesis-configs/afan-shard PORT=9002 P2P_PORT=6002 MIN_NUM_VALIDATORS=3 ACCOUNT_INDEX=1 STAKE=100000 CONSOLE_LOG=true ENABLE_DEV_SET_CLIENT_API=true ENABLE_TX_SIG_VERIF_WORKAROUND=true ENABLE_GAS_FEE_WORKAROUND=true BLOCKCHAIN_DATA_DIR=~/ain_blockchain_data node ./client/index.js &
+sleep 10
+GENESIS_CONFIGS_DIR=genesis-configs/afan-shard PORT=9003 P2P_PORT=6003 MIN_NUM_VALIDATORS=3 ACCOUNT_INDEX=2 STAKE=100000 CONSOLE_LOG=true ENABLE_DEV_SET_CLIENT_API=true ENABLE_TX_SIG_VERIF_WORKAROUND=true ENABLE_GAS_FEE_WORKAROUND=true BLOCKCHAIN_DATA_DIR=~/ain_blockchain_data node ./client/index.js &
+sleep 10
+
+# CHILD CHAIN 2
+GENESIS_CONFIGS_DIR=genesis-configs/sim-shard PORT=9010 P2P_PORT=6010 BLOCKCHAIN_DATA_DIR=~/ain_blockchain_data node ./tracker-server/index.js &
+sleep 10
+GENESIS_CONFIGS_DIR=genesis-configs/sim-shard PORT=9011 P2P_PORT=6011 MIN_NUM_VALIDATORS=3 ACCOUNT_INDEX=0 STAKE=100000 CONSOLE_LOG=true ENABLE_DEV_SET_CLIENT_API=true ENABLE_TX_SIG_VERIF_WORKAROUND=true ENABLE_GAS_FEE_WORKAROUND=true BLOCKCHAIN_DATA_DIR=~/ain_blockchain_data node ./client/index.js &
+sleep 10
+
+while :
+do
+    nodeState=$(curl -m 20 -X GET -H "Content-Type: application/json" "http://localhost:9011/node_status" | jq -r '.result.state')
+    printf "\nnodeState = ${nodeState}\n"
+    if [[ "$nodeState" = "SERVING" ]]; then
+        printf "\nShard node 0 is now serving!\n"
+        break
+    fi
+    sleep 20
+done
+
+GENESIS_CONFIGS_DIR=genesis-configs/sim-shard PORT=9012 P2P_PORT=6012 MIN_NUM_VALIDATORS=3 ACCOUNT_INDEX=1 STAKE=100000 CONSOLE_LOG=true ENABLE_DEV_SET_CLIENT_API=true ENABLE_TX_SIG_VERIF_WORKAROUND=true ENABLE_GAS_FEE_WORKAROUND=true BLOCKCHAIN_DATA_DIR=~/ain_blockchain_data node ./client/index.js &
+sleep 10
+GENESIS_CONFIGS_DIR=genesis-configs/sim-shard PORT=9013 P2P_PORT=6013 MIN_NUM_VALIDATORS=3 ACCOUNT_INDEX=2 STAKE=100000 CONSOLE_LOG=true ENABLE_DEV_SET_CLIENT_API=true ENABLE_TX_SIG_VERIF_WORKAROUND=true ENABLE_GAS_FEE_WORKAROUND=true BLOCKCHAIN_DATA_DIR=~/ain_blockchain_data node ./client/index.js &
+sleep 10
diff --git a/start_tracker_gcp.sh b/start_tracker_gcp.sh
deleted file mode 100644
index 2937880c0..000000000
--- a/start_tracker_gcp.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-export CONSOLE_LOG=false 
-
-echo 'Starting up Tracker server..'
-nohup node --async-stack-traces tracker-server/index.js >/dev/null 2>error_logs.txt &
-echo "Tracker server is now up!"
diff --git a/setup_tracker_gcp.sh b/start_tracker_genesis_gcp.sh
similarity index 65%
rename from setup_tracker_gcp.sh
rename to start_tracker_genesis_gcp.sh
index 1539eca38..a1c2a601a 100644
--- a/setup_tracker_gcp.sh
+++ b/start_tracker_genesis_gcp.sh
@@ -18,3 +18,10 @@ cd ../ain-blockchain
 
 echo 'Installing node modules..'
 npm install
+
+
+export CONSOLE_LOG=false 
+
+echo 'Starting up Blockchain Tracker server..'
+nohup node --async-stack-traces tracker-server/index.js >/dev/null 2>error_logs.txt &
+echo "Blockchain Tracker server is now up!"
diff --git a/start_tracker_incremental_gcp.sh b/start_tracker_incremental_gcp.sh
new file mode 100644
index 000000000..71343f1f5
--- /dev/null
+++ b/start_tracker_incremental_gcp.sh
@@ -0,0 +1,85 @@
+#!/bin/sh
+
+if [[ "$#" -lt 1 ]] || [[ "$#" -gt 1 ]]; then
+    printf "Usage: sh start_tracker_incremental_gcp.sh <Number of Nodes>\n"
+    printf "Example: sh start_tracker_incremental_gcp.sh 5\n"
+    exit
+fi
+
+# 1. Configure env vars
+printf "\n#### [Step 1] Configure env vars ####\n\n"
+
+NUM_NODES="$1"
+
+date=$(date '+%Y-%m-%dT%H:%M')
+printf "date=$date\n"
+NEW_DIR_PATH="../ain-blockchain-$date"
+printf "NEW_DIR_PATH=$NEW_DIR_PATH\n"
+
+# 2. Get currently used directory
+printf "\n#### [Step 2] Get currently used directory ####\n\n"
+
+OLD_DIR_PATH=$(find ../ain-blockchain* -maxdepth 0 -type d)
+printf "OLD_DIR_PATH=$OLD_DIR_PATH\n"
+
+# 3. Create a new directory
+printf "\n#### [Step 3] Create a new directory ####\n\n"
+
+MKDIR_CMD="sudo mkdir $NEW_DIR_PATH"
+printf "MKDIR_CMD=$MKDIR_CMD\n"
+eval $MKDIR_CMD
+
+sudo chmod 777 $NEW_DIR_PATH
+mv * $NEW_DIR_PATH
+
+# 4. Install dependencies
+printf "\n#### [Step 4] Install dependencies ####\n\n"
+
+cd $NEW_DIR_PATH
+npm install
+
+# 5. Kill old tracker server 
+printf "\n#### [Step 5] Kill old tracker server ####\n\n"
+
+KILL_CMD="sudo killall node"
+printf "KILL_CMD='$KILL_CMD'\n\n"
+eval $KILL_CMD
+
+# 6. Start new tracker server
+printf "\n#### [Step 6] Start new tracker server ####\n\n"
+
+sleep 10
+export CONSOLE_LOG=false 
+
+START_CMD="nohup node --async-stack-traces tracker-server/index.js >/dev/null 2>error_logs.txt &"
+printf "START_CMD='$START_CMD'\n"
+eval $START_CMD
+
+# 7. Wait until the new tracker server catches up
+printf "\n#### [Step 7] Wait until the new tracker server catches up ####\n\n"
+
+SECONDS=0
+loopCount=0
+
+while :
+do
+    numAliveNodes=$(curl -m 20 -X GET -H "Content-Type: application/json" "http://localhost:8080/network_status" | jq -r '.numAliveNodes')
+    printf "\nnumAliveNodes = ${numAliveNodes}\n"
+    if [[ "$numAliveNodes" = "$NUM_NODES" ]]; then
+        printf "\nBlockchain Tracker server is running!\n"
+        printf "\nTime it took to sync in seconds: $SECONDS\n"
+        break
+    fi
+    ((loopCount++))
+    printf "\nLoop count: ${loopCount}\n"
+    sleep 20
+done
+
+# 8. Remove old directory keeping the chain data
+printf "\n#### [Step 8] Remove old directory keeping the chain data ####\n\n"
+
+RM_CMD="sudo rm -rf $OLD_DIR_PATH"
+printf "RM_CMD='$RM_CMD'\n"
+eval $RM_CMD
+
+printf "\n* << Tracker server successfully deployed! ************************************\n\n"
diff --git a/stop_servers.sh b/stop_servers_local.sh
similarity index 100%
rename from stop_servers.sh
rename to stop_servers_local.sh
diff --git a/tools/chatbot/sendCreateAppAndConfigTx.js b/tools/chatbot/sendCreateAppAndConfigTx.js
index b7876539c..9efa540be 100644
--- a/tools/chatbot/sendCreateAppAndConfigTx.js
+++ b/tools/chatbot/sendCreateAppAndConfigTx.js
@@ -42,7 +42,9 @@ function buildChatbotConfigTxBody(timestamp) {
           type: "SET_RULE",
           ref: "/apps/chatbots/common/message/$key",
           value: {
-            ".write": true
+            ".rule": {
+              "write": true
+            }
           }
         },
         {
diff --git a/tools/simple-load-test/index.js b/tools/simple-load-test/index.js
index ca67261d2..34e298705 100644
--- a/tools/simple-load-test/index.js
+++ b/tools/simple-load-test/index.js
@@ -97,7 +97,9 @@ async function initPermission(targetUrl) {
       type: 'SET_RULE',
       ref: testPath,
       value: {
-        '.write': true,
+        '.rule': {
+          'write': true,
+        }
       },
     },
     timestamp: Date.now(),
diff --git a/tracker-server/index.js b/tracker-server/index.js
index de4d4558d..f935b8303 100755
--- a/tracker-server/index.js
+++ b/tracker-server/index.js
@@ -250,6 +250,7 @@ function getStatus() {
     networkStatus: {
       numAliveNodes: getNumAliveNodes(),
     },
+    cpuStatus: getCpuUsage(),
     memoryStatus: getMemoryUsage(),
     diskStatus: getDiskUsage(),
     runtimeInfo: getRuntimeInfo(),
@@ -257,25 +258,37 @@ function getStatus() {
   };
 }
 
-function getDiskUsage() {
-  try {
-    const diskUsage = disk.checkSync(DISK_USAGE_PATH);
-    const used = _.get(diskUsage, 'total', 0) - _.get(diskUsage, 'free', 0);
-    return Object.assign({}, diskUsage, { used });
-  } catch (err) {
-    logger.error(`Error: ${err} ${err.stack}`);
-    return {};
+function getCpuUsage() {
+  const cores = os.cpus();
+  let free = 0;
+  let total = 0;
+  for (const core of cores) {
+    const cpuInfo = _.get(core, 'times');
+    const idle = _.get(cpuInfo, 'idle');
+    const allTimes = Object.values(cpuInfo).reduce((acc, cur) => { return acc + cur }, 0);
+    free += idle;
+    total += allTimes;
   }
+  const usage = total - free;
+  const usagePercent = total ? usage / total * 100 : 0;
+  return {
+    free,
+    usage,
+    usagePercent,
+    total
+  };
 }
 
 function getMemoryUsage() {
   const free = os.freemem();
   const total = os.totalmem();
   const usage = total - free;
+  const usagePercent = total ? usage / total * 100 : 0;
   return {
     os: {
       free,
       usage,
+      usagePercent,
       total,
     },
     heap: process.memoryUsage(),
@@ -283,6 +296,20 @@ function getMemoryUsage() {
   };
 }
 
+function getDiskUsage() {
+  try {
+    const diskUsage = disk.checkSync(DISK_USAGE_PATH);
+    const free =  _.get(diskUsage, 'free', 0);
+    const total = _.get(diskUsage, 'total', 0);
+    const usage = total - free;
+    const usagePercent = total ? usage / total * 100 : 0;
+    return Object.assign({}, diskUsage, { usage, usagePercent });
+  } catch (err) {
+    logger.error(`Error: ${err} ${err.stack}`);
+    return {};
+  }
+}
+
 function getRuntimeInfo() {
   return {
     process: {
@@ -304,6 +331,7 @@ function getRuntimeInfo() {
       NETWORK_OPTIMIZATION: process.env.NETWORK_OPTIMIZATION,
       GENESIS_CONFIGS_DIR: process.env.GENESIS_CONFIGS_DIR,
       MIN_NUM_VALIDATORS: process.env.MIN_NUM_VALIDATORS,
+      MAX_NUM_VALIDATORS: process.env.MAX_NUM_VALIDATORS,
       ACCOUNT_INDEX: process.env.ACCOUNT_INDEX,
       P2P_PORT: process.env.P2P_PORT,
       PORT: process.env.PORT,
diff --git a/tx-pool/index.js b/tx-pool/index.js
index d43bc77fa..48b23968d 100644
--- a/tx-pool/index.js
+++ b/tx-pool/index.js
@@ -8,8 +8,9 @@ const {
   LIGHTWEIGHT,
   TX_POOL_SIZE_LIMIT,
   TX_POOL_SIZE_LIMIT_PER_ACCOUNT,
-  BANDWIDTH_BUDGET_PER_BLOCK,
   SERVICE_BANDWIDTH_BUDGET_PER_BLOCK,
+  APPS_BANDWIDTH_BUDGET_PER_BLOCK,
+  FREE_BANDWIDTH_BUDGET_PER_BLOCK,
   GenesisSharding,
   GenesisAccounts,
   ShardingProperties,
@@ -26,7 +27,6 @@ const {
 const Transaction = require('./transaction');
 
 const parentChainEndpoint = GenesisSharding[ShardingProperties.PARENT_CHAIN_POC] + '/json-rpc';
-const APP_BANDWIDTH_BUDGET_PER_BLOCK = BANDWIDTH_BUDGET_PER_BLOCK - SERVICE_BANDWIDTH_BUDGET_PER_BLOCK;
 
 class TransactionPool {
   constructor(node) {
@@ -39,7 +39,7 @@ class TransactionPool {
     this.txCountTotal = 0;
   }
 
-  addTransaction(tx) {
+  addTransaction(tx, isExecutedTx = false) {
     // NOTE(platfowner): A transaction needs to be converted to an executable form
     //                   before being added.
     if (!Transaction.isExecutable(tx)) {
@@ -60,7 +60,7 @@ class TransactionPool {
     }
     this.transactions[tx.address].push(tx);
     this.transactionTracker[tx.hash] = {
-      state: TransactionStates.IN_POOL,
+      state: isExecutedTx ? TransactionStates.EXECUTED : TransactionStates.PENDING,
       address: tx.address,
       index: this.transactions[tx.address].length - 1,
       timestamp: tx.tx_body.timestamp,
@@ -199,13 +199,13 @@ class TransactionPool {
     // Initial ordering by nonce is preserved.
     const merged = TransactionPool.mergeMultipleSortedArrays(Object.values(addrToTxList));
     const checkedTxs = this.performBandwidthChecks(merged, tempDb);
-    this.node.destroyDb(tempDb);
+    tempDb.destroyDb();
     return checkedTxs;
   }
 
   getAppBandwidthAllocated(db, appStakesTotal, appName) {
     const appStake = db ? db.getAppStake(appName) : 0;
-    return appStakesTotal > 0 ? APP_BANDWIDTH_BUDGET_PER_BLOCK * appStake / appStakesTotal : 0;
+    return appStakesTotal > 0 ? APPS_BANDWIDTH_BUDGET_PER_BLOCK * appStake / appStakesTotal : 0;
   }
 
   // NOTE(liayoo): txList is already sorted by their gas prices and/or timestamps,
@@ -214,6 +214,7 @@ class TransactionPool {
   performBandwidthChecks(txList, db) {
     const candidateTxList = [];
     let serviceBandwidthSum = 0;
+    let freeTierBandwidthSum = 0;
     const appBandwidthSum = {};
     // Sum of all apps' staked AIN
     const appStakesTotal = db ? db.getAppStakesTotal() : 0;
@@ -228,8 +229,8 @@ class TransactionPool {
         discardedTxList.push(tx);
         continue;
       }
-      const serviceBandwidth = _.get(tx, 'extra.gas.service', 0);
-      const appBandwidth = _.get(tx, 'extra.gas.app', null);
+      const serviceBandwidth = _.get(tx, 'extra.gas.bandwidth.service', 0);
+      const appBandwidth = _.get(tx, 'extra.gas.bandwidth.app', null);
       // Check if tx exceeds service bandwidth
       if (serviceBandwidth) {
         if (serviceBandwidthSum + serviceBandwidth > SERVICE_BANDWIDTH_BUDGET_PER_BLOCK) {
@@ -249,26 +250,34 @@ class TransactionPool {
       let isSkipped = false;
       if (appBandwidth) {
         const tempAppBandwidthSum = {};
+        let tempFreeTierBandwidthSum = freeTierBandwidthSum;
         for (const [appName, bandwidth] of Object.entries(appBandwidth)) {
           const appBandwidthAllocated =
               this.getAppBandwidthAllocated(db, appStakesTotal, appName);
           const currAppBandwidthSum =
               _.get(appBandwidthSum, appName, 0) + _.get(tempAppBandwidthSum, appName, 0);
           if (currAppBandwidthSum + bandwidth > appBandwidthAllocated) {
-            // Exceeds app bandwidth budget. Discard tx.
-            if (nonce >= 0) {
-              addrToDiscardedNoncedTx[tx.address] = true;
+            if (appBandwidthAllocated === 0 &&
+              tempFreeTierBandwidthSum + bandwidth <= FREE_BANDWIDTH_BUDGET_PER_BLOCK) {
+              // May be able to include this tx for the free tier budget.
+              tempFreeTierBandwidthSum += bandwidth;
+            } else {
+              // Exceeds app bandwidth budget. Discard tx.
+              if (nonce >= 0) {
+                addrToDiscardedNoncedTx[tx.address] = true;
+              }
+              if (FeatureFlags.enableRichTxSelectionLogging) {
+                logger.debug(`Skipping app tx: ${currAppBandwidthSum + bandwidth} > ${appBandwidthAllocated}`);
+              }
+              isSkipped = true;
+              discardedTxList.push(tx);
+              break;
             }
-            if (FeatureFlags.enableRichTxSelectionLogging) {
-              logger.debug(`Skipping app tx: ${currAppBandwidthSum + bandwidth} > ${appBandwidthAllocated}`);
-            }
-            isSkipped = true;
-            discardedTxList.push(tx);
-            break;
           }
           CommonUtil.setJsObject(tempAppBandwidthSum, [appName], bandwidth);
         }
         if (!isSkipped) {
+          freeTierBandwidthSum = tempFreeTierBandwidthSum;
           CommonUtil.mergeNumericJsObjects(appBandwidthSum, appBandwidth);
         }
       }
@@ -304,8 +313,8 @@ class TransactionPool {
     while (i < len1 && j < len2) {
       const tx1 = arr1[i];
       const tx2 = arr2[j];
-      const isTx1ServiceTx = !!_.get(tx1, 'extra.gas.service', false);
-      const isTx2ServiceTx = !!_.get(tx2, 'extra.gas.service', false);
+      const isTx1ServiceTx = !!_.get(tx1, 'extra.gas.bandwidth.service', false);
+      const isTx2ServiceTx = !!_.get(tx2, 'extra.gas.bandwidth.service', false);
       if (isTx1ServiceTx && isTx2ServiceTx) {
         // Compare gas price if both service transactions
         if (tx1.tx_body.gas_price > tx2.tx_body.gas_price) {
diff --git a/unittest/block-pool.test.js b/unittest/block-pool.test.js
index 06b829e42..ef65a2956 100644
--- a/unittest/block-pool.test.js
+++ b/unittest/block-pool.test.js
@@ -2,7 +2,7 @@ const chai = require('chai');
 const expect = chai.expect;
 const rimraf = require('rimraf');
 const assert = chai.assert;
-const { CHAINS_DIR } = require('../common/constants');
+const { CHAINS_DIR, PredefinedDbPaths } = require('../common/constants');
 const BlockPool = require('../consensus/block-pool');
 const BlockchainNode = require('../node');
 const { Block } = require('../blockchain/block');
@@ -25,7 +25,7 @@ describe("BlockPool", () => {
   function createAndAddBlock(node, blockPool, lastBlock, number, epoch) {
     const block = Block.create(
         lastBlock.hash, [], [], number, epoch, '', node.account.address,
-        {[node.account.address]: 100000}, 0, 0);
+        {[node.account.address]: { [PredefinedDbPaths.STAKE]: 100000, [PredefinedDbPaths.PROPOSAL_RIGHT]: true } }, 0, 0);
     const proposal = getTransaction(node, {
         operation: {
           type: 'SET_VALUE',
@@ -33,7 +33,7 @@ describe("BlockPool", () => {
           value: {
             number: block.number,
             epoch: block.epoch,
-            validators: {[node.account.address]: 100000},
+            validators: { [node.account.address]: { [PredefinedDbPaths.STAKE]: 100000, [PredefinedDbPaths.PROPOSAL_RIGHT]: true } },
             total_at_stake: 100000,
             proposer: node.account.address,
             block_hash: block.hash
@@ -65,7 +65,8 @@ describe("BlockPool", () => {
     const lastBlock = node1.bc.lastBlock();
     const addr = node1.account.address;
     const block = Block.create(
-        lastBlock.hash, [], [], lastBlock.number + 1, lastBlock.epoch + 1, '', addr, {[addr]: 100000}, 0, 0);
+        lastBlock.hash, [], [], lastBlock.number + 1, lastBlock.epoch + 1, '', addr,
+        {[addr]: { [PredefinedDbPaths.STAKE]: 100000, [PredefinedDbPaths.PROPOSAL_RIGHT]: true }}, 0, 0);
     const proposalTx = getTransaction(node1, {
         operation: {
           type: 'SET_VALUE',
@@ -73,7 +74,7 @@ describe("BlockPool", () => {
           value: {
             number: block.number,
             epoch: block.epoch,
-            validators: {[addr]: 100000},
+            validators: {[addr]: { [PredefinedDbPaths.STAKE]: 100000, [PredefinedDbPaths.PROPOSAL_RIGHT]: true } },
             total_at_stake: 100000,
             proposer: addr,
             block_hash: block.hash
@@ -93,7 +94,8 @@ describe("BlockPool", () => {
     const addr = node1.account.address;
     const lastBlock = node1.bc.lastBlock();
     const block = Block.create(
-        lastBlock.hash, [], [], lastBlock.number + 1, lastBlock.epoch + 1, '', addr, {[addr]: 100000}, 0, 0);
+        lastBlock.hash, [], [], lastBlock.number + 1, lastBlock.epoch + 1, '', addr,
+        {[addr]: { [PredefinedDbPaths.STAKE]: 100000, [PredefinedDbPaths.PROPOSAL_RIGHT]: true }}, 0, 0);
     const proposalTx = getTransaction(node1, {
         operation: {
           type: 'SET_VALUE',
@@ -101,7 +103,7 @@ describe("BlockPool", () => {
           value: {
             number: block.number,
             epoch: block.epoch,
-            validators: {[addr]: 100000},
+            validators: {[addr]: { [PredefinedDbPaths.STAKE]: 100000, [PredefinedDbPaths.PROPOSAL_RIGHT]: true } },
             total_at_stake: 100000,
             proposer: addr,
             block_hash: block.hash
diff --git a/unittest/blockchain.test.js b/unittest/blockchain.test.js
index f447d9b92..1decd0f19 100644
--- a/unittest/blockchain.test.js
+++ b/unittest/blockchain.test.js
@@ -50,13 +50,13 @@ describe('Blockchain', () => {
     const data = 'foo';
     node1.bc.addNewBlock(Block.create(
         data, node1, node1.bc.lastBlockNumber() + 1, node1.bc.lastBlock(), 0, 0));
-    expect(Blockchain.isValidChain(node1.bc.chain)).to.equal(true);
+    expect(Blockchain.validateChainSegment(node1.bc.chain)).to.equal(true);
   });
   */
 
   it('invalidates chain with corrupt genesis block', () => {
     node1.bc.chain[0].transactions = ':(';
-    expect(Blockchain.isValidChain(node1.bc.chain)).to.equal(false);
+    expect(Blockchain.validateChainSegment(node1.bc.chain)).to.equal(false);
   });
 
   it('invalidates corrupt chain', () => {
@@ -69,7 +69,7 @@ describe('Blockchain', () => {
         lastBlock.hash, [], [tx], lastBlock.number + 1, lastBlock.epoch + 1, '',
         node1.account.address, {}, 0, 0));
     node1.bc.chain[node1.bc.chain.length - 1].transactions = ':(';
-    expect(Blockchain.isValidChain(node1.bc.chain)).to.equal(false);
+    expect(Blockchain.validateChainSegment(node1.bc.chain)).to.equal(false);
   });
 
   describe('with lots of blocks', () => {
@@ -105,7 +105,7 @@ describe('Blockchain', () => {
       while (!node1.bc.lastBlock() || !node2.bc.lastBlock() || node1.bc.lastBlock().hash !== node2.bc.lastBlock().hash) {
         const blockSection = node1.bc.getBlockList(node2.bc.lastBlock().number + 1);
         if (blockSection) {
-          node2.mergeChainSegment(blockSection);
+          expect(node2.mergeChainSegment(blockSection)).to.equal(true);
         }
       }
       assert.deepEqual(JSON.stringify(node1.bc.chain), JSON.stringify(node2.bc.chain));
diff --git a/unittest/chain-util.test.js b/unittest/common-util.test.js
similarity index 71%
rename from unittest/chain-util.test.js
rename to unittest/common-util.test.js
index 653adc8ac..7f8e22a7b 100644
--- a/unittest/chain-util.test.js
+++ b/unittest/common-util.test.js
@@ -205,7 +205,8 @@ describe("CommonUtil", () => {
       }
     };
     const value = {
-      some: 'value'
+      some: 'value',
+      b: 'other b value'
     };
     let obj;
 
@@ -247,11 +248,27 @@ describe("CommonUtil", () => {
       assert.deepEqual(obj.b.ba.baz, value);
     })
 
-    it("when empty path", () => {
-      expect(CommonUtil.setJsObject(obj, [], value)).to.equal(false);
+    it("when empty path with primitive value", () => {
+      expect(CommonUtil.setJsObject(obj, [], 'some value')).to.equal(false);
       assert.deepEqual(obj, org);  // No change.
     })
 
+    it("when empty path with object value", () => {
+      expect(CommonUtil.setJsObject(obj, [], value)).to.equal(true);
+      for (const key in value) {
+        if (value.hasOwnProperty(key)) {
+          expect(obj.hasOwnProperty(key)).to.equal(true);
+          assert.deepEqual(obj[key], value[key]);
+        }
+      }
+      for (const key in org) {
+        if (org.hasOwnProperty(key) && !value.hasOwnProperty(key)) {
+          expect(obj.hasOwnProperty(key)).to.equal(true);
+          assert.deepEqual(obj[key], org[key]);
+        }
+      }
+    })
+
     it("when existing path", () => {
       expect(CommonUtil.setJsObject(obj, ['a'], value)).to.equal(true);
       assert.deepEqual(obj.a, value);
@@ -389,143 +406,143 @@ describe("CommonUtil", () => {
       expect(CommonUtil.isFailedTx({
         "func_results": {
           "_saveLastTx": {
-            "op_results": [
-              {
-                "path": "/test/test_function_triggering/allowed_path/.last_tx/value",
+            "op_results": {
+              "0": {
+                "path": "/apps/test/test_function_triggering/allowed_path/.last_tx/value",
                 "result": {
                   "func_results": {
                     "_eraseValue": {
-                      "op_results": [
-                        {
-                          "path": "/test/test_function_triggering/allowed_path/.last_tx/value",
+                      "op_results": {
+                        "0": {
+                          "path": "/apps/test/test_function_triggering/allowed_path/.last_tx/value",
                           "result": {
                             "code": 0,
-                            "gas_amount": 1
+                            "bandwidth_gas_amount": 1
                           }
                         }
-                      ],
+                      },
                       "code": "SUCCESS",
-                      "gas_amount": 0,
+                      "bandwidth_gas_amount": 0,
                     }
                   },
                   "code": 0,
-                  "gas_amount": 1
+                  "bandwidth_gas_amount": 1
                 }
               }
-            ],
+            },
             "code": "SUCCESS",
-            "gas_amount": 0,
+            "bandwidth_gas_amount": 0,
           }
         },
         "code": 0,
-        "gas_amount": 1
+        "bandwidth_gas_amount": 1
       })).to.equal(false);
 
       expect(CommonUtil.isFailedTx({
         "func_results": {
           "_saveLastTx": {
-            "op_results": [
-              {
-                "path": "/test/test_function_triggering/allowed_path/.last_tx/value",
+            "op_results": {
+              "0": {
+                "path": "/apps/test/test_function_triggering/allowed_path/.last_tx/value",
                 "result": {
                   "func_results": {
                     "_eraseValue": {
-                      "op_results": [
-                        {
-                          "path": "/test/test_function_triggering/allowed_path/.last_tx/value",
+                      "op_results": {
+                        "0": {
+                          "path": "/apps/test/test_function_triggering/allowed_path/.last_tx/value",
                           "result": {
                             "code": 0,
-                            "gas_amount": 1
+                            "bandwidth_gas_amount": 1
                           }
                         }
-                      ],
+                      },
                       "code": "SUCCESS",
-                      "gas_amount": 0,
+                      "bandwidth_gas_amount": 0,
                     }
                   },
                   "code": 0,
-                  "gas_amount": 1
+                  "bandwidth_gas_amount": 1
                 }
               }
-            ],
+            },
             "code": "SUCCESS",
-            "gas_amount": 0,
+            "bandwidth_gas_amount": 0,
           }
         },
         "code": 201,  // The root operation failed
         "error_message": "Not a number type: bar or 10",
-        "gas_amount": 1
+        "bandwidth_gas_amount": 1
       })).to.equal(true);
 
       expect(CommonUtil.isFailedTx({
         "func_results": {
           "_saveLastTx": {
-            "op_results": [
-              {
-                "path": "/test/test_function_triggering/allowed_path/.last_tx/value",
+            "op_results": {
+              "0": {
+                "path": "/apps/test/test_function_triggering/allowed_path/.last_tx/value",
                 "result": {
                   "func_results": {
                     "_eraseValue": {
-                      "op_results": [
-                        {
-                          "path": "/test/test_function_triggering/allowed_path/.last_tx/value",
+                      "op_results": {
+                        "0": {
+                          "path": "/apps/test/test_function_triggering/allowed_path/.last_tx/value",
                           "result": {
                             "code": 201,  // A sub-operation failed
                             "error_message": "Not a number type: bar or 10",
-                            "gas_amount": 1
+                            "bandwidth_gas_amount": 1
                           }
                         }
-                      ],
+                      },
                       "code": "SUCCESS",
-                      "gas_amount": 0,
+                      "bandwidth_gas_amount": 0,
                     }
                   },
                   "code": 0,
-                  "gas_amount": 1
+                  "bandwidth_gas_amount": 1
                 }
               }
-            ],
+            },
             "code": "SUCCESS",
-            "gas_amount": 0,
+            "bandwidth_gas_amount": 0,
           }
         },
         "code": 0,
-        "gas_amount": 1
+        "bandwidth_gas_amount": 1
       })).to.equal(true);
 
       expect(CommonUtil.isFailedTx({
         "func_results": {
           "_saveLastTx": {
-            "op_results": [
-              {
-                "path": "/test/test_function_triggering/allowed_path/.last_tx/value",
+            "op_results": {
+              "0": {
+                "path": "/apps/test/test_function_triggering/allowed_path/.last_tx/value",
                 "result": {
                   "func_results": {
                     "_eraseValue": {
-                      "op_results": [
-                        {
-                          "path": "/test/test_function_triggering/allowed_path/.last_tx/value",
+                      "op_results": {
+                        "0": {
+                          "path": "/apps/test/test_function_triggering/allowed_path/.last_tx/value",
                           "result": {
                             "code": 0,
-                            "gas_amount": 1
+                            "bandwidth_gas_amount": 1
                           }
                         }
-                      ],
+                      },
                       "code": "FAILURE",  // A function failed.
-                      "gas_amount": 0,
+                      "bandwidth_gas_amount": 0,
                     }
                   },
                   "code": 0,
-                  "gas_amount": 1
+                  "bandwidth_gas_amount": 1
                 }
               }
-            ],
+            },
             "code": "SUCCESS",
-            "gas_amount": 0,
+            "bandwidth_gas_amount": 0,
           }
         },
         "code": 0,
-        "gas_amount": 1
+        "bandwidth_gas_amount": 1
       })).to.equal(true);
     });
 
@@ -535,338 +552,344 @@ describe("CommonUtil", () => {
         "func_results": {
           "0x11111": {
             "code": "SUCCESS",
-            "gas_amount": 10,
+            "bandwidth_gas_amount": 10,
+          }
+        },
+        "bandwidth_gas_amount": 1,
+        "gas_amount_total": {
+          "bandwidth": {
+            "service": 11,
           }
         },
-        "gas_amount": 1,
-        "gas_amount_total": 11,
         "gas_cost_total": 0,
       })).to.equal(false);
     });
 
     it("when multi-set operation without function triggering", () => {
       expect(CommonUtil.isFailedTx({
-        "result_list": [
-          {
+        "result_list": {
+          "0": {
             "code": 0,
-            "gas_amount": 1
+            "bandwidth_gas_amount": 1
           },
-          {
+          "1": {
             "code": 0,
-            "gas_amount": 1,
+            "bandwidth_gas_amount": 1,
           },
-          {
+          "2": {
             "code": 0,
-            "gas_amount": 1
+            "bandwidth_gas_amount": 1
           },
-        ],
+        },
       })).to.equal(false);
 
       expect(CommonUtil.isFailedTx({
-        "result_list": [
-          {
+        "result_list": {
+          "0": {
             "code": 0,
-            "gas_amount": 1
+            "bandwidth_gas_amount": 1
           },
-          {
+          "1": {
             "code": 201,
             "error_message": "Not a number type: bar or 10",
-            "gas_amount": 0
+            "bandwidth_gas_amount": 0
           },
-          {
+          "2": {
             "code": 0,
-            "gas_amount": 1
+            "bandwidth_gas_amount": 1
           },
-        ]
+        }
       })).to.equal(true);
     })
 
     it("when multi-set operation with native function triggering", () => {
       expect(CommonUtil.isFailedTx({
-        "result_list": [
-          {
+        "result_list": {
+          "0": {
             "code": 0,
-            "gas_amount": 1
+            "bandwidth_gas_amount": 1
           },
-          {
+          "1": {
             "func_results": {
               "_saveLastTx": {
-                "op_results": [
-                  {
-                    "path": "/test/test_function_triggering/allowed_path/.last_tx/value",
+                "op_results": {
+                  "0": {
+                    "path": "/apps/test/test_function_triggering/allowed_path/.last_tx/value",
                     "result": {
                       "func_results": {
                         "_eraseValue": {
-                          "op_results": [
-                            {
-                              "path": "/test/test_function_triggering/allowed_path/.last_tx/value",
+                          "op_results": {
+                            "0": {
+                              "path": "/apps/test/test_function_triggering/allowed_path/.last_tx/value",
                               "result": {
                                 "code": 0,
-                                "gas_amount": 1
+                                "bandwidth_gas_amount": 1
                               }
                             }
-                          ],
+                          },
                           "code": "SUCCESS",
-                          "gas_amount": 0,
+                          "bandwidth_gas_amount": 0,
                         }
                       },
                       "code": 0,
-                      "gas_amount": 1
+                      "bandwidth_gas_amount": 1
                     }
                   }
-                ],
+                },
                 "code": "SUCCESS",
-                "gas_amount": 0,
+                "bandwidth_gas_amount": 0,
               }
             },
             "code": 0,
-            "gas_amount": 1,
+            "bandwidth_gas_amount": 1,
           },
-          {
+          "2": {
             "code": 0,
-            "gas_amount": 1,
+            "bandwidth_gas_amount": 1,
           }
-        ]
+        }
       })).to.equal(false);
 
       expect(CommonUtil.isFailedTx({
-        "result_list": [
-          {
+        "result_list": {
+          "0": {
             "code": 0,
-            "gas_amount": 1
+            "bandwidth_gas_amount": 1
           },
-          {
+          "1": {
             "func_results": {
               "_saveLastTx": {
-                "op_results": [
-                  {
-                    "path": "/test/test_function_triggering/allowed_path/.last_tx/value",
+                "op_results": {
+                  "0": {
+                    "path": "/apps/test/test_function_triggering/allowed_path/.last_tx/value",
                     "result": {
                       "func_results": {
                         "_eraseValue": {
-                          "op_results": [
-                            {
-                              "path": "/test/test_function_triggering/allowed_path/.last_tx/value",
+                          "op_results": {
+                            "0": {
+                              "path": "/apps/test/test_function_triggering/allowed_path/.last_tx/value",
                               "result": {
                                 "code": 0,
-                                "gas_amount": 1
+                                "bandwidth_gas_amount": 1
                               }
                             }
-                          ],
+                          },
                           "code": "SUCCESS",
-                          "gas_amount": 0,
+                          "bandwidth_gas_amount": 0,
                         }
                       },
                       "code": 0,
-                      "gas_amount": 1
+                      "bandwidth_gas_amount": 1
                     }
                   }
-                ],
+                },
                 "code": "SUCCESS",
-                "gas_amount": 0,
+                "bandwidth_gas_amount": 0,
               }
             },
             "code": 0,
-            "gas_amount": 0
+            "bandwidth_gas_amount": 0
           },
-          {
+          "2": {
             "code": 201,  // One of the root operations failed.
             "error_message": "Not a number type: bar or 10",
-            "gas_amount": 1,
+            "bandwidth_gas_amount": 1,
           },
-        ]
+        }
       })).to.equal(true);
 
       expect(CommonUtil.isFailedTx({
-        "result_list": [
-          {
+        "result_list": {
+          "0": {
             "code": 0,
-            "gas_amount": 1
+            "bandwidth_gas_amount": 1
           },
-          {
+          "1": {
             "func_results": {
               "_saveLastTx": {
-                "op_results": [
-                  {
-                    "path": "/test/test_function_triggering/allowed_path/.last_tx/value",
+                "op_results": {
+                  "0": {
+                    "path": "/apps/test/test_function_triggering/allowed_path/.last_tx/value",
                     "result": {
                       "func_results": {
                         "_eraseValue": {
-                          "op_results": [
-                            {
-                              "path": "/test/test_function_triggering/allowed_path/.last_tx/value",
+                          "op_results": {
+                            "0": {
+                              "path": "/apps/test/test_function_triggering/allowed_path/.last_tx/value",
                               "result": {
                                 "code": 201,  // A sub-operation failed.
                                 "error_message": "Not a number type: bar or 10",
-                                "gas_amount": 1
+                                "bandwidth_gas_amount": 1
                               }
                             }
-                          ],
+                          },
                           "code": "SUCCESS",
-                          "gas_amount": 0,
+                          "bandwidth_gas_amount": 0,
                         }
                       },
                       "code": 0,
-                      "gas_amount": 1
+                      "bandwidth_gas_amount": 1
                     }
                   }
-                ],
+                },
                 "code": "SUCCESS",
-                "gas_amount": 0,
+                "bandwidth_gas_amount": 0,
               }
             },
             "code": 0,
-            "gas_amount": 0
+            "bandwidth_gas_amount": 0
           },
-          {
+          "2": {
             "code": 0,
-            "gas_amount": 1,
+            "bandwidth_gas_amount": 1,
           },
-        ]
+        }
       })).to.equal(true);
 
       expect(CommonUtil.isFailedTx({
-        "result_list": [
-          {
+        "result_list": {
+          "0": {
             "code": 0,
-            "gas_amount": 1
+            "bandwidth_gas_amount": 1
           },
-          {
+          "1": {
             "func_results": {
               "_saveLastTx": {
-                "op_results": [
-                  {
-                    "path": "/test/test_function_triggering/allowed_path/.last_tx/value",
+                "op_results": {
+                  "0": {
+                    "path": "/apps/test/test_function_triggering/allowed_path/.last_tx/value",
                     "result": {
                       "func_results": {
                         "_eraseValue": {
-                          "op_results": [
-                            {
-                              "path": "/test/test_function_triggering/allowed_path/.last_tx/value",
+                          "op_results": {
+                            "0": {
+                              "path": "/apps/test/test_function_triggering/allowed_path/.last_tx/value",
                               "result": {
                                 "code": 0,
-                                "gas_amount": 1
+                                "bandwidth_gas_amount": 1
                               }
                             }
-                          ],
+                          },
                           "code": "FAILURE",  // A function failed.
-                          "gas_amount": 0,
+                          "bandwidth_gas_amount": 0,
                         }
                       },
                       "code": 0,
-                      "gas_amount": 1
+                      "bandwidth_gas_amount": 1
                     }
                   }
-                ],
+                },
                 "code": "SUCCESS",
-                "gas_amount": 0,
+                "bandwidth_gas_amount": 0,
               }
             },
             "code": 0,
-            "gas_amount": 0
+            "bandwidth_gas_amount": 0
           },
-          {
+          "2": {
             "code": 0,
-            "gas_amount": 1,
+            "bandwidth_gas_amount": 1,
           },
-        ]
+        }
       })).to.equal(true);
     })
 
     it("when multi-set operation with REST function triggering", () => {
       expect(CommonUtil.isFailedTx({
-        "result_list": [
-          {
+        "result_list": {
+          "0": {
             "code": 0,
-            "gas_amount": 1,
+            "bandwidth_gas_amount": 1,
             "gas_amount_total": {
-              "service": 1,
-              "app": {}
+              "bandwidth": {
+                "service": 1,
+              }
             },
             "gas_cost_total": 0
           },
-          {
+          "1": {
             "code": 0,
             "func_results": {
               "0x11111": {
                 "code": "SUCCESS",
-                "gas_amount": 10,
+                "bandwidth_gas_amount": 10,
               }
             },
-            "gas_amount": 1,
+            "bandwidth_gas_amount": 1,
             "gas_amount_total": {
-              "service": 11,
-              "app": {}
+              "bandwidth": {
+                "service": 11,
+              }
             },
             "gas_cost_total": 0
           },
-          {
+          "2": {
             "code": 0,
-            "gas_amount": 1,
+            "bandwidth_gas_amount": 1,
             "gas_amount_total": {
-              "service": 1,
-              "app": {}
+              "bandwidth": {
+                "service": 1,
+              }
             }
           }
-        ]
+        }
       })).to.equal(false);
     });
   })
 
-  describe("getTotalGasAmount", () => {
-    const op = { ref: '/test', value: null, type: 'SET_VALUE' };
+  describe("getTotalBandwidthGasAmount", () => {
+    const serviceOp = { ref: '/transfer/test', value: null, type: 'SET_VALUE' };
     const appOp = { ref: '/apps/test', value: null, type: 'SET_VALUE' };
 
     it("when abnormal input", () => {
-      const emptyVal = { app: {}, service: 0 };
-      assert.deepEqual(CommonUtil.getTotalGasAmount(op, null), emptyVal);
-      assert.deepEqual(CommonUtil.getTotalGasAmount(op, undefined), emptyVal);
-      assert.deepEqual(CommonUtil.getTotalGasAmount(op, {}), emptyVal);
-      assert.deepEqual(CommonUtil.getTotalGasAmount(op, { gas: 'gas' }), emptyVal);
-      assert.deepEqual(CommonUtil.getTotalGasAmount(op, { gas: {} }), emptyVal);
-      assert.deepEqual(CommonUtil.getTotalGasAmount(op, true), emptyVal);
-      assert.deepEqual(CommonUtil.getTotalGasAmount(op, 'result'), emptyVal);
-      assert.deepEqual(CommonUtil.getTotalGasAmount(op, 0), emptyVal);
-      assert.deepEqual(CommonUtil.getTotalGasAmount(op, 1), emptyVal);
+      const emptyVal = { service: 0 };
+      assert.deepEqual(CommonUtil.getTotalBandwidthGasAmount(serviceOp, null), emptyVal);
+      assert.deepEqual(CommonUtil.getTotalBandwidthGasAmount(serviceOp, undefined), emptyVal);
+      assert.deepEqual(CommonUtil.getTotalBandwidthGasAmount(serviceOp, {}), emptyVal);
+      assert.deepEqual(CommonUtil.getTotalBandwidthGasAmount(serviceOp, { gas: 'gas' }), emptyVal);
+      assert.deepEqual(CommonUtil.getTotalBandwidthGasAmount(serviceOp, { gas: {} }), emptyVal);
+      assert.deepEqual(CommonUtil.getTotalBandwidthGasAmount(serviceOp, true), emptyVal);
+      assert.deepEqual(CommonUtil.getTotalBandwidthGasAmount(serviceOp, 'result'), emptyVal);
+      assert.deepEqual(CommonUtil.getTotalBandwidthGasAmount(serviceOp, 0), emptyVal);
+      assert.deepEqual(CommonUtil.getTotalBandwidthGasAmount(serviceOp, 1), emptyVal);
     })
 
     it("when single operation result input (service)", () => {
       const result = {
         "func_results": {
           "_saveLastTx": {
-            "op_results": [
-              {
-                "path": "/test/test_function_triggering/allowed_path/.last_tx/value",
+            "op_results": {
+              "0": {
+                "path": "/transfer/test/test_function_triggering/allowed_path/.last_tx/value",
                 "result": {
                   "func_results": {
                     "_eraseValue": {
-                      "op_results": [
-                        {
-                          "path": "/test/test_function_triggering/allowed_path/.last_tx/value",
+                      "op_results": {
+                        "0": {
+                          "path": "/transfer/test/test_function_triggering/allowed_path/.last_tx/value",
                           "result": {
                             "code": 0,
-                            "gas_amount": 1
+                            "bandwidth_gas_amount": 1
                           }
                         }
-                      ],
+                      },
                       "code": "SUCCESS",
-                      "gas_amount": 10
+                      "bandwidth_gas_amount": 10
                     }
                   },
                   "code": 0,
-                  "gas_amount": 1
+                  "bandwidth_gas_amount": 1
                 }
               }
-            ],
+            },
             "code": "SUCCESS",
-            "gas_amount": 20,
+            "bandwidth_gas_amount": 20,
           }
         },
         "code": 0,
-        "gas_amount": 30
+        "bandwidth_gas_amount": 30
       };
-      assert.deepEqual(CommonUtil.getTotalGasAmount(op, result), {
-        app: {},
+      assert.deepEqual(CommonUtil.getTotalBandwidthGasAmount(serviceOp, result), {
         service: 62
       });
     })
@@ -875,38 +898,38 @@ describe("CommonUtil", () => {
       const result = {
         "func_results": {
           "_saveLastTx": {
-            "op_results": [
-              {
+            "op_results": {
+              "0": {
                 "path": "/apps/test/test_function_triggering/allowed_path/.last_tx/value",
                 "result": {
                   "func_results": {
                     "_eraseValue": {
-                      "op_results": [
-                        {
+                      "op_results": {
+                        "0": {
                           "path": "/apps/test/test_function_triggering/allowed_path/.last_tx/value",
                           "result": {
                             "code": 0,
-                            "gas_amount": 1
+                            "bandwidth_gas_amount": 1
                           }
                         }
-                      ],
+                      },
                       "code": "SUCCESS",
-                      "gas_amount": 10
+                      "bandwidth_gas_amount": 10
                     }
                   },
                   "code": 0,
-                  "gas_amount": 1
+                  "bandwidth_gas_amount": 1
                 }
               }
-            ],
+            },
             "code": "SUCCESS",
-            "gas_amount": 20,
+            "bandwidth_gas_amount": 20,
           }
         },
         "code": 0,
-        "gas_amount": 30
+        "bandwidth_gas_amount": 30
       };
-      assert.deepEqual(CommonUtil.getTotalGasAmount(appOp, result), {
+      assert.deepEqual(CommonUtil.getTotalBandwidthGasAmount(appOp, result), {
         app: {
           test: 62
         },
@@ -918,38 +941,38 @@ describe("CommonUtil", () => {
       const result = {
         "func_results": {
           "_saveLastTx": {
-            "op_results": [
-              {
+            "op_results": {
+              "0": {
                 "path": "/apps/test/test_function_triggering/allowed_path/.last_tx/value",
                 "result": {
                   "func_results": {
                     "_eraseValue": {
-                      "op_results": [
-                        {
-                          "path": "/test/test_function_triggering/allowed_path/.last_tx/value",
+                      "op_results": {
+                        "0": {
+                          "path": "/transfer/test/test_function_triggering/allowed_path/.last_tx/value",
                           "result": {
                             "code": 0,
-                            "gas_amount": 1
+                            "bandwidth_gas_amount": 1
                           }
                         }
-                      ],
+                      },
                       "code": "SUCCESS",
-                      "gas_amount": 10
+                      "bandwidth_gas_amount": 10
                     }
                   },
                   "code": 0,
-                  "gas_amount": 1
+                  "bandwidth_gas_amount": 1
                 }
               }
-            ],
+            },
             "code": "SUCCESS",
-            "gas_amount": 20,
+            "bandwidth_gas_amount": 20,
           }
         },
         "code": 0,
-        "gas_amount": 30
+        "bandwidth_gas_amount": 30
       };
-      assert.deepEqual(CommonUtil.getTotalGasAmount(appOp, result), {
+      assert.deepEqual(CommonUtil.getTotalBandwidthGasAmount(appOp, result), {
         app: {
           test: 61
         },
@@ -958,51 +981,50 @@ describe("CommonUtil", () => {
     })
 
     it("when multiple operation result input (service)", () => {
-      const setTxOp = { type: 'SET', op_list: [{...op}, {...op}] };
+      const setTxOp = { type: 'SET', op_list: [{...serviceOp}, {...serviceOp}] };
       const result = {
-        "result_list": [
-          {
+        "result_list": {
+          "0": {
             "func_results": {
               "_saveLastTx": {
-                "op_results": [
-                  {
-                    "path": "/test/test_function_triggering/allowed_path/.last_tx/value",
+                "op_results": {
+                  "0": {
+                    "path": "/transfer/test/test_function_triggering/allowed_path/.last_tx/value",
                     "result": {
                       "func_results": {
                         "_eraseValue": {
-                          "op_results": [
-                            {
-                              "path": "/test/test_function_triggering/allowed_path/.last_tx/value",
+                          "op_results": {
+                            "0": {
+                              "path": "/transfer/test/test_function_triggering/allowed_path/.last_tx/value",
                               "result": {
                                 "code": 0,
-                                "gas_amount": 1
+                                "bandwidth_gas_amount": 1
                               }
                             }
-                          ],
+                          },
                           "code": "SUCCESS",
-                          "gas_amount": 10
+                          "bandwidth_gas_amount": 10
                         }
                       },
                       "code": 0,
-                      "gas_amount": 1
+                      "bandwidth_gas_amount": 1
                     }
                   }
-                ],
+                },
                 "code": "SUCCESS",
-                "gas_amount": 20
+                "bandwidth_gas_amount": 20
               }
             },
             "code": 0,
-            "gas_amount": 30
+            "bandwidth_gas_amount": 30
           },
-          {
+          "1": {
             "code": 0,
-            "gas_amount": 1
+            "bandwidth_gas_amount": 1
           },
-        ]
+        }
       };
-      assert.deepEqual(CommonUtil.getTotalGasAmount(setTxOp, result), {
-        app: {},
+      assert.deepEqual(CommonUtil.getTotalBandwidthGasAmount(setTxOp, result), {
         service: 63
       });
     })
@@ -1010,48 +1032,48 @@ describe("CommonUtil", () => {
     it("when multiple operation result input (app)", () => {
       const setTxOp = { type: 'SET', op_list: [{...appOp}, {...appOp}] };
       const result = {
-        "result_list": [
-          {
+        "result_list": {
+          "0": {
             "func_results": {
               "_saveLastTx": {
-                "op_results": [
-                  {
+                "op_results": {
+                  "0": {
                     "path": "/apps/test/test_function_triggering/allowed_path/.last_tx/value",
                     "result": {
                       "func_results": {
                         "_eraseValue": {
-                          "op_results": [
-                            {
+                          "op_results": {
+                            "0": {
                               "path": "/apps/test/test_function_triggering/allowed_path/.last_tx/value",
                               "result": {
                                 "code": 0,
-                                "gas_amount": 1
+                                "bandwidth_gas_amount": 1
                               }
                             }
-                          ],
+                          },
                           "code": "SUCCESS",
-                          "gas_amount": 10
+                          "bandwidth_gas_amount": 10
                         }
                       },
                       "code": 0,
-                      "gas_amount": 1
+                      "bandwidth_gas_amount": 1
                     }
                   }
-                ],
+                },
                 "code": "SUCCESS",
-                "gas_amount": 20
+                "bandwidth_gas_amount": 20
               }
             },
             "code": 0,
-            "gas_amount": 30
+            "bandwidth_gas_amount": 30
           },
-          {
+          "1": {
             "code": 0,
-            "gas_amount": 1
+            "bandwidth_gas_amount": 1
           },
-        ]
+        }
       };
-      assert.deepEqual(CommonUtil.getTotalGasAmount(setTxOp, result), {
+      assert.deepEqual(CommonUtil.getTotalBandwidthGasAmount(setTxOp, result), {
         app: {
           test: 63
         },
@@ -1060,54 +1082,54 @@ describe("CommonUtil", () => {
     })
 
     it("when multiple operation result input (service & app)", () => {
-      const setTxOp = { type: 'SET', op_list: [{...appOp}, {...op}] };
+      const setTxOp = { type: 'SET', op_list: [{...appOp}, {...serviceOp}] };
       const result = {
-        "result_list": [
-          {
+        "result_list": {
+          "0": {
             "func_results": {
               "_saveLastTx": {
-                "op_results": [
-                  {
-                    "path": "/test/test_function_triggering/allowed_path/.last_tx/value",
+                "op_results": {
+                  "0": {
+                    "path": "/apps/test/test_function_triggering/allowed_path/.last_tx/value",
                     "result": {
                       "func_results": {
                         "_eraseValue": {
-                          "op_results": [
-                            {
-                              "path": "/test/test_function_triggering/allowed_path/.last_tx/value",
+                          "op_results": {
+                            "0": {
+                              "path": "/apps/test/test_function_triggering/allowed_path/.last_tx/value",
                               "result": {
                                 "code": 0,
-                                "gas_amount": 1
+                                "bandwidth_gas_amount": 1
                               }
                             }
-                          ],
+                          },
                           "code": "SUCCESS",
-                          "gas_amount": 10
+                          "bandwidth_gas_amount": 10
                         }
                       },
                       "code": 0,
-                      "gas_amount": 1
+                      "bandwidth_gas_amount": 1
                     }
                   }
-                ],
+                },
                 "code": "SUCCESS",
-                "gas_amount": 20
+                "bandwidth_gas_amount": 20
               }
             },
             "code": 0,
-            "gas_amount": 30
+            "bandwidth_gas_amount": 30
           },
-          {
+          "1": {
             "code": 0,
-            "gas_amount": 1
+            "bandwidth_gas_amount": 1
           },
-        ]
+        }
       };
-      assert.deepEqual(CommonUtil.getTotalGasAmount(setTxOp, result), {
+      assert.deepEqual(CommonUtil.getTotalBandwidthGasAmount(setTxOp, result), {
         app: {
-          test: 50
+          test: 62
         },
-        service: 13
+        service: 1
       });
     })
   })
diff --git a/unittest/consensus.test.js b/unittest/consensus.test.js
index 7c9a716b0..91566b203 100644
--- a/unittest/consensus.test.js
+++ b/unittest/consensus.test.js
@@ -1,7 +1,12 @@
 const chai = require('chai');
 const expect = chai.expect;
 const rimraf = require('rimraf');
-const { CHAINS_DIR } = require('../common/constants');
+const {
+  CHAINS_DIR,
+  MIN_STAKE_PER_VALIDATOR,
+  MAX_STAKE_PER_VALIDATOR,
+  PredefinedDbPaths,
+} = require('../common/constants');
 const BlockchainNode = require('../node');
 const { setNodeForTesting, getTransaction, addBlock } = require('./test-util')
 
@@ -25,20 +30,22 @@ describe("Consensus", () => {
     const tx = getTransaction(node1, {
         operation: { 
           type: 'SET_VALUE', 
-          ref: '/afan/test', 
-          value: 'foo'
+          ref: `/transfer/${node1.account.address}/${node2.account.address}/0/value`,
+          value: 1
         },
+        nonce: -1,
         gas_price: 1
       }
     );
     addBlock(node1, [tx], [], {});
     const lastBlock = node1.bc.lastBlock();
-    const voteTx = getTransaction(node1, {
+    const voteTx = getTransaction(node2, {
         operation: { 
           type: 'SET_VALUE', 
-          ref: `/consensus/number/1/vote/${node1.account.address}`,
-          value: { block_hash: lastBlock.hash, stake: 0 }
+          ref: `/consensus/number/1/vote/${node2.account.address}`,
+          value: { block_hash: lastBlock.hash, stake: 100000 }
         },
+        nonce: -1,
         gas_price: 1
       }
     );
@@ -46,27 +53,159 @@ describe("Consensus", () => {
   });
 
   it("Staked nodes can vote", () => {
-    const addr = node1.account.address;
-    const stakeTx = getTransaction(node1, {
+    const addr = node2.account.address; // Staked node without producing rights
+    const stakeTx = getTransaction(node2, {
         operation: { 
           type: 'SET_VALUE', 
           ref: `/staking/consensus/${addr}/0/stake/key1/value`, 
-          value: 200
+          value: 100000
         },
+        nonce: -1,
         gas_price: 1
       }
     );
     addBlock(node1, [stakeTx], [], {});
     const lastBlock = node1.bc.lastBlock();
-    const voteTx = getTransaction(node1, {
+    const voteTx = getTransaction(node2, {
         operation: {
           type: 'SET_VALUE', 
           ref: `/consensus/number/${lastBlock.number}/vote/${addr}`,
-          value: { block_hash: lastBlock.hash, stake: 200 }
+          value: { block_hash: lastBlock.hash, stake: 100000 }
         },
+        nonce: -1,
         gas_price: 1
       }
     );
     expect(node1.db.executeTransaction(voteTx).code).to.equal(0);
   });
+
+  it('Staked nodes without producing rights cannot propose blocks', () => {
+    const addr = node2.account.address;
+    const stakeTx = getTransaction(node2, {
+        operation: { 
+          type: 'SET_VALUE', 
+          ref: `/staking/consensus/${addr}/0/stake/key1/value`, 
+          value: 100000
+        },
+        nonce: -1,
+        gas_price: 1
+      }
+    );
+    addBlock(node1, [stakeTx], [], {});
+    const lastBlock = node1.bc.lastBlock();
+    const voteTx = getTransaction(node2, {
+        operation: {
+          type: 'SET_VALUE', 
+          ref: `/consensus/number/${lastBlock.number + 1}/propose/${addr}`,
+          value: {
+            number: lastBlock.number + 1,
+            proposer: addr,
+            gas_cost_total: 0
+          }
+        },
+        nonce: -1,
+        gas_price: 1
+      }
+    );
+    expect(node1.db.executeTransaction(voteTx).code).to.equal(103);
+  });
+
+  it('Whitelisted validators must stake within MIN_STAKE_PER_VALIDATOR & MAX_STAKE_PER_VALIDATOR to have the producing rights', () => {
+    let lastBlock = node1.bc.lastBlock();
+    const addr = node2.account.address;
+    // Bypass whitelist rule check (need owner's private key)
+    const tempDb = node1.createTempDb(node1.db.stateVersion, 'CONSENSUS_UNIT_TEST', lastBlock.number);
+    tempDb.writeDatabase(
+        [PredefinedDbPaths.VALUES_ROOT, PredefinedDbPaths.CONSENSUS, PredefinedDbPaths.WHITELIST, addr],
+        true);
+    node1.cloneAndFinalizeVersion(tempDb.stateVersion, -1); // Bypass already existing final state version
+    
+    // Staking less than MIN_STAKE_PER_VALIDATOR
+    let stakeAmount = MIN_STAKE_PER_VALIDATOR - 1;
+    const stakeLessThanMin = getTransaction(node2, {
+        operation: { 
+          type: 'SET_VALUE', 
+          ref: `/staking/consensus/${addr}/0/stake/key1/value`, 
+          value: stakeAmount
+        },
+        nonce: -1,
+        gas_price: 1
+      }
+    );
+    addBlock(node1, [stakeLessThanMin], [], {});
+    lastBlock = node1.bc.lastBlock();
+    const voteWithStakeLessThanMin = getTransaction(node2, {
+        operation: {
+          type: 'SET_VALUE',
+          ref: `/consensus/number/${lastBlock.number + 1}/propose/${addr}`,
+          value: {
+            number: lastBlock.number + 1,
+            proposer: addr,
+            gas_cost_total: 0
+          }
+        },
+        nonce: -1,
+        gas_price: 1
+      }
+    );
+    expect(node1.db.executeTransaction(voteWithStakeLessThanMin).code).to.equal(103); // Fails
+
+    // Staking MIN_STAKE_PER_VALIDATOR
+    const stakeEqualMin = getTransaction(node2, {
+        operation: { 
+          type: 'SET_VALUE', 
+          ref: `/staking/consensus/${addr}/0/stake/key2/value`, 
+          value: 1
+        },
+        nonce: -1,
+        gas_price: 1
+      }
+    );
+    addBlock(node1, [stakeEqualMin], [], {});
+    lastBlock = node1.bc.lastBlock();
+    const voteWithStakeEqualMin = getTransaction(node2, {
+        operation: {
+          type: 'SET_VALUE', 
+          ref: `/consensus/number/${lastBlock.number + 1}/propose/${addr}`,
+          value: {
+            number: lastBlock.number + 1,
+            proposer: addr,
+            gas_cost_total: 0
+          }
+        },
+        nonce: -1,
+        gas_price: 1
+      }
+    );
+    expect(node1.db.executeTransaction(voteWithStakeEqualMin).code).to.equal(0); // Succeeds
+
+    // Staking more than MAX_STAKE_PER_VALIDATOR
+    const stakeMoreThanMax = getTransaction(node2, {
+        operation: { 
+          type: 'SET_VALUE', 
+          ref: `/staking/consensus/${addr}/0/stake/key3/value`, 
+          value: MAX_STAKE_PER_VALIDATOR - MIN_STAKE_PER_VALIDATOR + 1 // 1 more than MAX_STAKE_PER_VALIDATOR
+        },
+        nonce: -1,
+        gas_price: 1
+      }
+    );
+    addBlock(node1, [stakeMoreThanMax], [], {});
+    lastBlock = node1.bc.lastBlock();
+    const voteWithStakeMoreThanMax = getTransaction(node2, {
+        operation: {
+          type: 'SET_VALUE', 
+          ref: `/consensus/number/${lastBlock.number + 1}/propose/${addr}`,
+          value: {
+            number: lastBlock.number + 1,
+            proposer: addr,
+            gas_cost_total: 0
+          }
+        },
+        nonce: -1,
+        gas_price: 1
+      }
+    );
+    expect(node1.db.executeTransaction(voteWithStakeMoreThanMax).code).to.equal(103); // Fails
+  });
 });
\ No newline at end of file
diff --git a/unittest/data/rules_for_testing.json b/unittest/data/rules_for_testing.json
index 7af9c6774..86e337fd2 100644
--- a/unittest/data/rules_for_testing.json
+++ b/unittest/data/rules_for_testing.json
@@ -1,72 +1,85 @@
 {
-  ".write": true,
+  ".rule": {
+    "write": true
+  },
   "ai": {
-    ".write": true
+    ".rule": {
+      "write": true
+    }
   },
   "comcom": {
-    ".write": true
-  },
-  "consensus": {
-    "number": {
-      "$number": {
-        ".write": "newData === null && !!getValue('/consensus/number/' + (Number($number) + 1000))",
-        "propose": {
-          ".write": "newData !== null && util.isDict(newData) && newData.proposer === auth.addr && Number($number) === newData.number && (newData.number === 1 || getValue('/consensus/number/' + (newData.number - 1) + '/propose/validators/' + auth.addr) > 0)"
-        },
-        "vote": {
-          "$user_addr": {
-            ".write": "auth.addr === $user_addr && util.isDict(newData) && util.isString(newData.block_hash) && util.isNumber(newData.stake) && newData.stake > 0 && getValue('/service_accounts/staking/consensus/' + $user_addr + '|0/value') >= newData.stake"
-          }
-        }
-      }
+    ".rule": {
+      "write": true
     }
   },
   "billing_keys": {
     "update_billing": {
-      ".write": true
+      ".rule": {
+        "write": true
+      }
     }
   },
   "nested":{
-    ".write": true
+    ".rule": {
+      "write": true
+    }
   },
   "new":{
-    ".write": true
+    ".rule": {
+      "write": true
+    }
   },
   "users":{
     "$uid": {
-      ".write": "auth.addr === $uid",
+      ".rule": {
+        "write": "auth.addr === $uid"
+      },
       "balance": {
-        ".write": "typeof newData === 'number' && newData >= 0"
+        ".rule": {
+          "write": "typeof newData === 'number' && newData >= 0"
+        }
       },
       "info": {
-        ".write": "data !== null"
+        ".rule": {
+          "write": "data !== null"
+        }
       },
       "balance_info": {
-        ".write": "getValue('test/billing_keys/update_billing/' + $uid) !== null"
+        ".rule": {
+          "write": "getValue('/apps/test/billing_keys/update_billing/' + $uid) !== null"
+        }
       },
       "next_counter": {
-        ".write": "typeof newData === 'number' && newData === data + 1"
+        ".rule": {
+          "write": "typeof newData === 'number' && newData === data + 1"
+        }
       }
     }
   },
   "second_users": {
     "$wcard1":{
       "$wcard2": {
-        ".write": "$wcard1 == $wcard2"
+        ".rule": {
+          "write": "$wcard1 == $wcard2"
+        }
       }
     }
   },
   "no_dup_key": {
     "$key1": {
       "$key2": {
-        ".write": true
+        ".rule": {
+          "write": true
+        }
       }
     }
   },
   "dup_key": {
     "$key1": {
       "$key1": {
-        ".write": true
+        ".rule": {
+          "write": true
+        }
       }
     }
   }
diff --git a/unittest/db.test.js b/unittest/db.test.js
index 7e6602df3..fce55e399 100644
--- a/unittest/db.test.js
+++ b/unittest/db.test.js
@@ -13,6 +13,9 @@ const {
   GenesisRules,
   GenesisOwners,
   ProofProperties,
+  PredefinedDbPaths,
+  StateInfoProperties,
+  SERVICE_STATE_BUDGET,
 } = require('../common/constants')
 const {
   setNodeForTesting,
@@ -20,6 +23,7 @@ const {
 const DB = require('../db');
 const Transaction = require('../tx-pool/transaction');
 const CommonUtil = require('../common/common-util');
+const ainUtil = require('@ainblockchain/ain-util');
 
 describe("DB initialization", () => {
   let node;
@@ -84,7 +88,11 @@ describe("DB initialization", () => {
       CommonUtil.setJsObject(
         genesisRuleWithConsensusApp,
         ['apps', 'consensus'],
-        {".write": "auth.addr === '0xAAAf6f50A0304F12119D218b94bea8082642515B'"}
+        {
+          ".rule": {
+            "write": "auth.addr === '0xAAAf6f50A0304F12119D218b94bea8082642515B'"
+          }
+        }
       );
       assert.deepEqual(node.db.getRule("/"), genesisRuleWithConsensusApp);
     })
@@ -153,7 +161,7 @@ describe("DB operations", () => {
         }
       }
     };
-    result = node.db.setValue("test", dbValues);
+    result = node.db.setValue("/apps/test", dbValues);
     assert.deepEqual(result.code, 0);
 
     dbFuncs = {
@@ -192,25 +200,31 @@ describe("DB operations", () => {
         },
       }
     };
-    result = node.db.setFunction("test/test_function", dbFuncs);
+    result = node.db.setFunction("/apps/test/test_function", dbFuncs);
     assert.deepEqual(result.code, 0);
 
     dbRules = {
       "some": {
         "$var_path": {
-          ".write": "auth.addr !== 'abcd'"
+          ".rule": {
+            "write": "auth.addr !== 'abcd'"
+          }
         },
         "path": {
-          ".write": "auth.addr === 'abcd'",
+          ".rule": {
+            "write": "auth.addr === 'abcd'",
+          },
           "deeper": {
             "path": {
-              ".write": "auth.addr === 'ijkl'"
+              ".rule": {
+                "write": "auth.addr === 'ijkl'"
+              }
             }
           }
         }
       }
     };
-    result = node.db.setRule("test/test_rule", dbRules);
+    result = node.db.setRule("/apps/test/test_rule", dbRules);
     assert.deepEqual(result.code, 0);
 
     dbOwners = {
@@ -255,7 +269,7 @@ describe("DB operations", () => {
         }
       }
     };
-    result = node.db.setOwner("test/test_owner", dbOwners);
+    result = node.db.setOwner("/apps/test/test_owner", dbOwners);
     assert.deepEqual(result.code, 0);
   });
 
@@ -266,11 +280,11 @@ describe("DB operations", () => {
   describe("Read operations", () => {
     describe("getValue()", () => {
       it("when retrieving high value near top of database", () => {
-        assert.deepEqual(node.db.getValue("test"), dbValues)
+        assert.deepEqual(node.db.getValue("/apps/test"), dbValues)
       })
 
       it('when retrieving value near top of database with is_shallow', () => {
-        assert.deepEqual(node.db.getValue('test', true, false), {
+        assert.deepEqual(node.db.getValue('/apps/test', { isShallow: true }), {
           'ai': true,
           'increment': true,
           'decrement': true,
@@ -279,31 +293,262 @@ describe("DB operations", () => {
         })
       });
 
+      it('when retrieving value with include_tree_info', () => {
+        assert.deepEqual(node.db.getValue('/apps/test', { includeTreeInfo: true }), {
+          ".num_parents": 1,
+          ".tree_bytes": 3708,
+          ".tree_height": 4,
+          ".tree_size": 21,
+          "ai": {
+            ".num_parents": 1,
+            ".num_parents:baz": 1,
+            ".num_parents:comcom": 1,
+            ".num_parents:foo": 1,
+            ".tree_bytes": 684,
+            ".tree_bytes:baz": 166,
+            ".tree_bytes:comcom": 168,
+            ".tree_bytes:foo": 166,
+            ".tree_height": 1,
+            ".tree_height:baz": 0,
+            ".tree_height:comcom": 0,
+            ".tree_height:foo": 0,
+            ".tree_size": 4,
+            ".tree_size:baz": 1,
+            ".tree_size:comcom": 1,
+            ".tree_size:foo": 1,
+            "baz": "qux",
+            "comcom": 123,
+            "foo": "bar",
+          },
+          "decrement": {
+            ".num_parents": 1,
+            ".num_parents:value": 1,
+            ".tree_bytes": 338,
+            ".tree_bytes:value": 168,
+            ".tree_height": 1,
+            ".tree_height:value": 0,
+            ".tree_size": 2,
+            ".tree_size:value": 1,
+            "value": 20,
+          },
+          "increment": {
+            ".num_parents": 1,
+            ".num_parents:value": 1,
+            ".tree_bytes": 338,
+            ".tree_bytes:value": 168,
+            ".tree_height": 1,
+            ".tree_height:value": 0,
+            ".tree_size": 2,
+            ".tree_size:value": 1,
+            "value": 20,
+          },
+          "nested": {
+            ".num_parents": 1,
+            ".tree_bytes": 502,
+            ".tree_height": 2,
+            ".tree_size": 3,
+            "far": {
+              ".num_parents": 1,
+              ".num_parents:down": 1,
+              ".tree_bytes": 336,
+              ".tree_bytes:down": 168,
+              ".tree_height": 1,
+              ".tree_height:down": 0,
+              ".tree_size": 2,
+              ".tree_size:down": 1,
+              "down": 456,
+            },
+          },
+          "shards": {
+            ".num_parents": 1,
+            ".tree_bytes": 1622,
+            ".tree_height": 3,
+            ".tree_size": 9,
+            "disabled_shard": {
+              ".num_parents": 1,
+              ".num_parents:path": 1,
+              ".shard": {
+                ".num_parents": 1,
+                ".num_parents:sharding_enabled": 1,
+                ".tree_bytes": 356,
+                ".tree_bytes:sharding_enabled": 164,
+                ".tree_height": 1,
+                ".tree_height:sharding_enabled": 0,
+                ".tree_size": 2,
+                ".tree_size:sharding_enabled": 1,
+                "sharding_enabled": false,
+              },
+              ".tree_bytes": 704,
+              ".tree_bytes:path": 168,
+              ".tree_height": 2,
+              ".tree_height:path": 0,
+              ".tree_size": 4,
+              ".tree_size:path": 1,
+              "path": 10,
+            },
+            "enabled_shard": {
+              ".num_parents": 1,
+              ".num_parents:path": 1,
+              ".shard": {
+                ".num_parents": 1,
+                ".num_parents:sharding_enabled": 1,
+                ".tree_bytes": 356,
+                ".tree_bytes:sharding_enabled": 164,
+                ".tree_height": 1,
+                ".tree_height:sharding_enabled": 0,
+                ".tree_size": 2,
+                ".tree_size:sharding_enabled": 1,
+                "sharding_enabled": true,
+              },
+              ".tree_bytes": 704,
+              ".tree_bytes:path": 168,
+              ".tree_height": 2,
+              ".tree_height:path": 0,
+              ".tree_size": 4,
+              ".tree_size:path": 1,
+              "path": 10,
+            }
+          }
+        })
+      });
+
+      it('when retrieving value with include_proof', () => {
+        assert.deepEqual(node.db.getValue('/apps/test', { includeProof: true }), {
+          ".proof_hash": "0x753458b0796af84a76e4256ec295c65a7563f5ef2c855f2ecc3e15f47887b8bf",
+          "ai": {
+            ".proof_hash": "0x475a10041bd4a36132a63b16f5ba0a2b528642f01a8d00923969507289239c44",
+            ".proof_hash:baz": "0x74e6d7e9818333ef5d6f4eb74dc0ee64537c9e142e4fe55e583476a62b539edf",
+            ".proof_hash:comcom": "0x90840252cdaacaf90d95c14f9d366f633fd53abf7a2c359f7abfb7f651b532b5",
+            ".proof_hash:foo": "0xea86f62ccb8ed9240afb6c9090be001ef7859bf40e0782f2b8d3579b3d8310a4",
+            "baz": "qux",
+            "comcom": 123,
+            "foo": "bar",
+          },
+          "decrement": {
+            ".proof_hash": "0x875a06d5687f3fe01ddee9a76b48c5439a233ad4753980d239e7b91793f4b2a3",
+            ".proof_hash:value": "0xc3c28ad8a683cb7f3d8cf05420651e08e14564e18a1805fe33720cd9d7d2deb2",
+            "value": 20,
+          },
+          "increment": {
+            ".proof_hash": "0x875a06d5687f3fe01ddee9a76b48c5439a233ad4753980d239e7b91793f4b2a3",
+            ".proof_hash:value": "0xc3c28ad8a683cb7f3d8cf05420651e08e14564e18a1805fe33720cd9d7d2deb2",
+            "value": 20,
+          },
+          "nested": {
+            ".proof_hash": "0xb2d436a46347f073c9fbbc6daf074c6020493d39bbcf6219f483d80ba4fcba12",
+            "far": {
+              ".proof_hash": "0xdb10e1d3b0aa83908d4414d79940160b4ee59fab7363c3223685829b31c9912d",
+              ".proof_hash:down": "0x4611868537ffbffa17f70f8ddb7cf5aacc6b4d1b32817315f631a2c7d6b6481d",
+              "down": 456,
+            },
+          },
+          "shards": {
+            ".proof_hash": "0xca7a8628678dd40de218e17a9df8acbbf31e596397ffcf94af36c2134be31e16",
+            "disabled_shard": {
+              ".proof_hash": "0xd05c3b7418eedc09e24d61376ddffabc28245006150e8ade7ee586109821c3f9",
+              ".proof_hash:path": "0xd024945cba75febe35837d24c977a187a6339888d99d505c1be63251fec52279",
+              ".shard": {
+                ".proof_hash": "0xc1def4354bd8f269460896e38f288dba21d77d2c115a02285f6cce8f7e646fca",
+                ".proof_hash:sharding_enabled": "0x055600b34c3a8a69ea5dfc2cd2f92336933be237c8b265089f3114b38b4a540a",
+                "sharding_enabled": false,
+              },
+              "path": 10,
+            },
+            "enabled_shard": {
+              ".proof_hash": "0xb9ab65702643eccef3d025b650a02af574b22fa52be1ac9272f20b382e21e84d",
+              ".proof_hash:path": "0xd024945cba75febe35837d24c977a187a6339888d99d505c1be63251fec52279",
+              ".shard": {
+                ".proof_hash": "0xca256dadfca4c89edbc3de62b0732eac55d792b4661fdbb1c1455bfc1ef9048b",
+                ".proof_hash:sharding_enabled": "0x1eafc1e61d5b7b28f90a34330bf62265eeb466e012aa7318098003f37e4c61cc",
+                "sharding_enabled": true,
+              },
+              "path": 10,
+            }
+          }
+        })
+      });
+
+      it('when retrieving value with include_version', () => {
+        assert.deepEqual(node.db.getValue('/apps/test', { includeVersion: true }), {
+          ".version": "NODE:0",
+          "ai": {
+            ".version": "NODE:0",
+            ".version:baz": "NODE:0",
+            ".version:comcom": "NODE:0",
+            ".version:foo": "NODE:0",
+            "baz": "qux",
+            "comcom": 123,
+            "foo": "bar",
+          },
+          "decrement": {
+            ".version": "NODE:0",
+            ".version:value": "NODE:0",
+            "value": 20,
+          },
+          "increment": {
+            ".version": "NODE:0",
+            ".version:value": "NODE:0",
+            "value": 20,
+          },
+          "nested": {
+            ".version": "NODE:0",
+            "far": {
+              ".version": "NODE:0",
+              ".version:down": "NODE:0",
+              "down": 456,
+            }
+          },
+          "shards": {
+            ".version": "NODE:0",
+            "disabled_shard": {
+              ".shard": {
+                ".version": "NODE:0",
+                ".version:sharding_enabled": "NODE:0",
+                "sharding_enabled": false,
+              },
+              ".version": "NODE:0",
+              ".version:path": "NODE:0",
+              "path": 10,
+            },
+            "enabled_shard": {
+              ".shard": {
+                ".version": "NODE:0",
+                ".version:sharding_enabled": "NODE:0",
+                "sharding_enabled": true,
+              },
+              ".version": "NODE:0",
+              ".version:path": "NODE:0",
+              "path": 10,
+            }
+          }
+        });
+      });
+
       it("when retrieving shallow nested value", () => {
-        assert.deepEqual(node.db.getValue("test/ai/comcom"), dbValues["ai"]["comcom"])
+        assert.deepEqual(node.db.getValue("/apps/test/ai/comcom"), dbValues["ai"]["comcom"])
       })
 
       it("when retrieving deeply nested value", () => {
-        assert.deepEqual(node.db.getValue("test/nested/far/down"), dbValues["nested"]["far"]["down"])
+        assert.deepEqual(node.db.getValue("/apps/test/nested/far/down"), dbValues["nested"]["far"]["down"])
       })
 
       it("by failing when value is not present", () => {
-        expect(node.db.getValue("test/nested/far/down/to/nowhere")).to.equal(null)
+        expect(node.db.getValue("/apps/test/nested/far/down/to/nowhere")).to.equal(null)
       })
 
       it("by failing when value is not present with is_shallow", () => {
-        expect(node.db.getValue("test/nested/far/down/to/nowhere", true, false)).to.equal(null)
+        expect(node.db.getValue("/apps/test/nested/far/down/to/nowhere", true, false)).to.equal(null)
       })
     })
 
     describe("getFunction()", () => {
       it("when retrieving non-existing function config", () => {
-        expect(node.db.getFunction("/test/test_function/other/function/path")).to.equal(null);
-        expect(node.db.getFunction("/test/test_function/some/other_path")).to.equal(null);
+        expect(node.db.getFunction("/apps/test/test_function/other/function/path")).to.equal(null);
+        expect(node.db.getFunction("/apps/test/test_function/some/other_path")).to.equal(null);
       })
 
       it("when retrieving existing function config", () => {
-        assert.deepEqual(node.db.getFunction("/test/test_function/some/path"), {
+        assert.deepEqual(node.db.getFunction("/apps/test/test_function/some/path"), {
           ".function": {
             "fid": {
               "event_listener": "https://events.ainetwork.ai/trigger",
@@ -328,7 +573,7 @@ describe("DB operations", () => {
       })
 
       it("when retrieving existing function config with is_shallow", () => {
-        assert.deepEqual(node.db.getFunction('test/test_function', true, false), {
+        assert.deepEqual(node.db.getFunction('/apps/test/test_function', { isShallow: true }), {
           some: true,
         });
       })
@@ -341,18 +586,22 @@ describe("DB operations", () => {
       })
 
       it("when retrieving existing rule config", () => {
-        assert.deepEqual(node.db.getRule("/test/test_rule/some/path"), {
-          ".write": "auth.addr === 'abcd'",
+        assert.deepEqual(node.db.getRule("/apps/test/test_rule/some/path"), {
+          ".rule": {
+            "write": "auth.addr === 'abcd'"
+          },
           "deeper": {
             "path": {
-              ".write": "auth.addr === 'ijkl'"
+              ".rule": {
+                "write": "auth.addr === 'ijkl'"
+              }
             }
           }
         });
       })
 
       it('when retrieving existing rule config with is_shallow', () => {
-        assert.deepEqual(node.db.getRule('test/test_rule', true, false), {
+        assert.deepEqual(node.db.getRule('/apps/test/test_rule', { isShallow: true }), {
           some: true,
         });
       });
@@ -360,11 +609,11 @@ describe("DB operations", () => {
 
     describe("getOwner()", () => {
       it("when retrieving non-existing owner config", () => {
-        expect(node.db.getOwner("/test/test_owner/other/owner/path")).to.equal(null)
+        expect(node.db.getOwner("/apps/test/test_owner/other/owner/path")).to.equal(null)
       })
 
       it("when retrieving existing owner config", () => {
-        assert.deepEqual(node.db.getOwner("/test/test_owner/some/path"), {
+        assert.deepEqual(node.db.getOwner("/apps/test/test_owner/some/path"), {
           ".owner": {
             "owners": {
               "*": {
@@ -405,7 +654,7 @@ describe("DB operations", () => {
       })
 
       it("when retrieving existing owner config with is_shallow", () => {
-        assert.deepEqual(node.db.getOwner("test/test_owner", true, false), {
+        assert.deepEqual(node.db.getOwner("/apps/test/test_owner", { isShallow: true }), {
           some: true,
         })
       })
@@ -413,10 +662,10 @@ describe("DB operations", () => {
 
     describe("matchFunction()", () => {
       it("when matching existing variable path function", () => {
-        assert.deepEqual(node.db.matchFunction("/test/test_function/some/var_path"), {
+        assert.deepEqual(node.db.matchFunction("/apps/test/test_function/some/var_path"), {
           "matched_path": {
-            "target_path": "/test/test_function/some/$var_path",
-            "ref_path": "/test/test_function/some/var_path",
+            "target_path": "/apps/test/test_function/some/$var_path",
+            "ref_path": "/apps/test/test_function/some/var_path",
             "path_vars": {
               "$var_path": "var_path"
             },
@@ -430,17 +679,17 @@ describe("DB operations", () => {
                 "service_name": "https://ainetwork.ai",
               },
             },
-            "path": "/test/test_function/some/$var_path"
+            "path": "/apps/test/test_function/some/$var_path"
           },
           "subtree_configs": []
         });
       })
 
       it("when matching existing non-variable path function", () => {
-        assert.deepEqual(node.db.matchFunction("/test/test_function/some/path"), {
+        assert.deepEqual(node.db.matchFunction("/apps/test/test_function/some/path"), {
           "matched_path": {
-            "target_path": "/test/test_function/some/path",
-            "ref_path": "/test/test_function/some/path",
+            "target_path": "/apps/test/test_function/some/path",
+            "ref_path": "/apps/test/test_function/some/path",
             "path_vars": {},
           },
           "matched_config": {
@@ -452,7 +701,7 @@ describe("DB operations", () => {
                 "service_name": "https://ainetwork.ai"
               }
             },
-            "path": "/test/test_function/some/path"
+            "path": "/apps/test/test_function/some/path"
           },
           "subtree_configs": [
             {
@@ -468,10 +717,10 @@ describe("DB operations", () => {
             }
           ]
         });
-        assert.deepEqual(node.db.matchFunction("/test/test_function/some/path/deeper/path"), {
+        assert.deepEqual(node.db.matchFunction("/apps/test/test_function/some/path/deeper/path"), {
           "matched_path": {
-            "target_path": "/test/test_function/some/path/deeper/path",
-            "ref_path": "/test/test_function/some/path/deeper/path",
+            "target_path": "/apps/test/test_function/some/path/deeper/path",
+            "ref_path": "/apps/test/test_function/some/path/deeper/path",
             "path_vars": {},
           },
           "matched_config": {
@@ -483,22 +732,22 @@ describe("DB operations", () => {
                 "service_name": "https://ainetwork.ai"
               }
             },
-            "path": "/test/test_function/some/path/deeper/path"
+            "path": "/apps/test/test_function/some/path/deeper/path"
           },
           "subtree_configs": []
         });
       })
 
       it("when NOT matching existing closest non-variable path function", () => {
-        assert.deepEqual(node.db.matchFunction("/test/test_function/some/path/deeper"), {
+        assert.deepEqual(node.db.matchFunction("/apps/test/test_function/some/path/deeper"), {
           "matched_path": {
-            "target_path": "/test/test_function/some/path/deeper",
-            "ref_path": "/test/test_function/some/path/deeper",
+            "target_path": "/apps/test/test_function/some/path/deeper",
+            "ref_path": "/apps/test/test_function/some/path/deeper",
             "path_vars": {},
           },
           "matched_config": {
             "config": null,
-            "path": "/test/test_function/some/path/deeper"
+            "path": "/apps/test/test_function/some/path/deeper"
           },
           "subtree_configs": [
             {
@@ -519,68 +768,80 @@ describe("DB operations", () => {
 
     describe("matchRule()", () => {
       it("when matching existing variable path rule", () => {
-        assert.deepEqual(node.db.matchRule("/test/test_rule/some/var_path"), {
+        assert.deepEqual(node.db.matchRule("/apps/test/test_rule/some/var_path"), {
           "matched_path": {
-            "target_path": "/test/test_rule/some/$var_path",
-            "ref_path": "/test/test_rule/some/var_path",
+            "target_path": "/apps/test/test_rule/some/$var_path",
+            "ref_path": "/apps/test/test_rule/some/var_path",
             "path_vars": {
               "$var_path": "var_path"
             },
           },
           "matched_config": {
-            "config": "auth.addr !== 'abcd'",
-            "path": "/test/test_rule/some/$var_path"
+            "config": {
+              "write": "auth.addr !== 'abcd'"
+            },
+            "path": "/apps/test/test_rule/some/$var_path"
           },
           "subtree_configs": []
         });
       })
 
       it("when matching existing non-variable path rule", () => {
-        assert.deepEqual(node.db.matchRule("/test/test_rule/some/path"), {
+        assert.deepEqual(node.db.matchRule("/apps/test/test_rule/some/path"), {
           "matched_path": {
-            "target_path": "/test/test_rule/some/path",
-            "ref_path": "/test/test_rule/some/path",
+            "target_path": "/apps/test/test_rule/some/path",
+            "ref_path": "/apps/test/test_rule/some/path",
             "path_vars": {},
           },
           "matched_config": {
-            "config": "auth.addr === 'abcd'",
-            "path": "/test/test_rule/some/path"
+            "config": {
+              "write": "auth.addr === 'abcd'"
+            },
+            "path": "/apps/test/test_rule/some/path"
           },
           "subtree_configs": [
             {
-              "config": "auth.addr === 'ijkl'",
+              "config": {
+                "write": "auth.addr === 'ijkl'"
+              },
               "path": "/deeper/path"
             }
           ]
         });
-        assert.deepEqual(node.db.matchRule("/test/test_rule/some/path/deeper/path"), {
+        assert.deepEqual(node.db.matchRule("/apps/test/test_rule/some/path/deeper/path"), {
           "matched_path": {
-            "target_path": "/test/test_rule/some/path/deeper/path",
-            "ref_path": "/test/test_rule/some/path/deeper/path",
+            "target_path": "/apps/test/test_rule/some/path/deeper/path",
+            "ref_path": "/apps/test/test_rule/some/path/deeper/path",
             "path_vars": {},
           },
           "matched_config": {
-            "config": "auth.addr === 'ijkl'",
-            "path": "/test/test_rule/some/path/deeper/path"
+            "config": {
+              "write": "auth.addr === 'ijkl'"
+            },
+            "path": "/apps/test/test_rule/some/path/deeper/path"
           },
           "subtree_configs": []
         });
       })
 
       it("when matching existing closest non-variable path rule", () => {
-        assert.deepEqual(node.db.matchRule("/test/test_rule/some/path/deeper"), {
+        assert.deepEqual(node.db.matchRule("/apps/test/test_rule/some/path/deeper"), {
           "matched_path": {
-            "target_path": "/test/test_rule/some/path/deeper",
-            "ref_path": "/test/test_rule/some/path/deeper",
+            "target_path": "/apps/test/test_rule/some/path/deeper",
+            "ref_path": "/apps/test/test_rule/some/path/deeper",
             "path_vars": {},
           },
           "matched_config": {
-            "config": "auth.addr === 'abcd'",
-            "path": "/test/test_rule/some/path"
+            "config": {
+              "write": "auth.addr === 'abcd'"
+            },
+            "path": "/apps/test/test_rule/some/path"
           },
           "subtree_configs": [
             {
-              "config": "auth.addr === 'ijkl'",
+              "config": {
+                "write": "auth.addr === 'ijkl'"
+              },
               "path": "/path"
             }
           ]
@@ -590,9 +851,9 @@ describe("DB operations", () => {
 
     describe("matchOwner()", () => {
       it("when matching existing owner with matching address", () => {
-        assert.deepEqual(node.db.matchOwner("/test/test_owner/some/path", 'write_owner', 'abcd'), {
+        assert.deepEqual(node.db.matchOwner("/apps/test/test_owner/some/path", 'write_owner', 'abcd'), {
           "matched_path": {
-            "target_path": "/test/test_owner/some/path"
+            "target_path": "/apps/test/test_owner/some/path"
           },
           "matched_config": {
             "config": {
@@ -611,12 +872,12 @@ describe("DB operations", () => {
                 }
               }
             },
-            "path": "/test/test_owner/some/path"
+            "path": "/apps/test/test_owner/some/path"
           }
         });
-        assert.deepEqual(node.db.matchOwner("/test/test_owner/some/path/deeper/path", 'write_owner', 'ijkl'), {
+        assert.deepEqual(node.db.matchOwner("/apps/test/test_owner/some/path/deeper/path", 'write_owner', 'ijkl'), {
           "matched_path": {
-            "target_path": "/test/test_owner/some/path/deeper/path"
+            "target_path": "/apps/test/test_owner/some/path/deeper/path"
           },
           "matched_config": {
             "config": {
@@ -635,15 +896,15 @@ describe("DB operations", () => {
                 }
               }
             },
-            "path": "/test/test_owner/some/path/deeper/path"
+            "path": "/apps/test/test_owner/some/path/deeper/path"
           }
         });
       })
 
       it("when matching existing owner without matching address", () => {
-        assert.deepEqual(node.db.matchOwner("/test/test_owner/some/path", 'write_owner', 'other'), {
+        assert.deepEqual(node.db.matchOwner("/apps/test/test_owner/some/path", 'write_owner', 'other'), {
           "matched_path": {
-            "target_path": "/test/test_owner/some/path"
+            "target_path": "/apps/test/test_owner/some/path"
           },
           "matched_config": {
             "config": {
@@ -662,12 +923,12 @@ describe("DB operations", () => {
                 }
               }
             },
-            "path": "/test/test_owner/some/path"
+            "path": "/apps/test/test_owner/some/path"
           }
         });
-        assert.deepEqual(node.db.matchOwner("/test/test_owner/some/path/deeper/path", 'write_owner', 'other'), {
+        assert.deepEqual(node.db.matchOwner("/apps/test/test_owner/some/path/deeper/path", 'write_owner', 'other'), {
           "matched_path": {
-            "target_path": "/test/test_owner/some/path/deeper/path"
+            "target_path": "/apps/test/test_owner/some/path/deeper/path"
           },
           "matched_config": {
             "config": {
@@ -686,15 +947,15 @@ describe("DB operations", () => {
                 }
               }
             },
-            "path": "/test/test_owner/some/path/deeper/path"
+            "path": "/apps/test/test_owner/some/path/deeper/path"
           }
         });
       })
 
       it("when matching closest owner", () => {
-        assert.deepEqual(node.db.matchOwner("/test/test_owner/some/path/deeper", 'write_owner', 'abcd'), {
+        assert.deepEqual(node.db.matchOwner("/apps/test/test_owner/some/path/deeper", 'write_owner', 'abcd'), {
           "matched_path": {
-            "target_path": "/test/test_owner/some/path/deeper"
+            "target_path": "/apps/test/test_owner/some/path/deeper"
           },
           "matched_config": {
             "config": {
@@ -713,7 +974,7 @@ describe("DB operations", () => {
                 }
               }
             },
-            "path": "/test/test_owner/some/path"
+            "path": "/apps/test/test_owner/some/path"
           }
         });
       })
@@ -722,32 +983,32 @@ describe("DB operations", () => {
     describe("evalRule()", () => {
       it("when evaluating existing variable path rule", () => {
         expect(node.db.evalRule(
-            "/test/test_rule/some/var_path", 'value', { addr: 'abcd' }, Date.now()))
+            "/apps/test/test_rule/some/var_path", 'value', { addr: 'abcd' }, Date.now()))
                 .to.equal(false);
         expect(node.db.evalRule(
-            "/test/test_rule/some/var_path", 'value', { addr: 'other' }, Date.now()))
+            "/apps/test/test_rule/some/var_path", 'value', { addr: 'other' }, Date.now()))
                 .to.equal(true);
       })
 
       it("when evaluating existing non-variable path rule", () => {
-        expect(node.db.evalRule("/test/test_rule/some/path", 'value', { addr: 'abcd' }, Date.now()))
+        expect(node.db.evalRule("/apps/test/test_rule/some/path", 'value', { addr: 'abcd' }, Date.now()))
             .to.equal(true);
-        expect(node.db.evalRule("/test/test_rule/some/path", 'value', { addr: 'other' }, Date.now()))
+        expect(node.db.evalRule("/apps/test/test_rule/some/path", 'value', { addr: 'other' }, Date.now()))
             .to.equal(false);
         expect(node.db.evalRule(
-            "/test/test_rule/some/path/deeper/path", 'value', { addr: 'ijkl' }, Date.now()))
+            "/apps/test/test_rule/some/path/deeper/path", 'value', { addr: 'ijkl' }, Date.now()))
                 .to.equal(true);
         expect(node.db.evalRule(
-            "/test/test_rule/some/path/deeper/path", 'value', { addr: 'other' }, Date.now()))
+            "/apps/test/test_rule/some/path/deeper/path", 'value', { addr: 'other' }, Date.now()))
                 .to.equal(false);
       })
 
       it("when evaluating existing closest rule", () => {
         expect(node.db.evalRule(
-            "/test/test_rule/some/path/deeper", 'value', { addr: 'abcd' }, Date.now()))
+            "/apps/test/test_rule/some/path/deeper", 'value', { addr: 'abcd' }, Date.now()))
                 .to.equal(true);
         expect(node.db.evalRule(
-            "/test/test_rule/some/path/deeper", 'value', { addr: 'other' }, Date.now()))
+            "/apps/test/test_rule/some/path/deeper", 'value', { addr: 'other' }, Date.now()))
                 .to.equal(false);
       })
     })
@@ -755,48 +1016,48 @@ describe("DB operations", () => {
     describe("evalOwner()", () => {
       it("when evaluating existing owner with matching address", () => {
         expect(node.db.evalOwner(
-            "/test/test_owner/some/path", 'write_owner',
+            "/apps/test/test_owner/some/path", 'write_owner',
             { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' }))
                 .to.equal(true);
-        expect(node.db.evalOwner("/test/test_owner/some/path", 'write_rule', { addr: '' }))
+        expect(node.db.evalOwner("/apps/test/test_owner/some/path", 'write_rule', { addr: '' }))
             .to.equal(false);
         expect(node.db.evalOwner(
-            "/test/test_owner/some/path/deeper/path", 'write_owner',
+            "/apps/test/test_owner/some/path/deeper/path", 'write_owner',
             { addr: '0x08Aed7AF9354435c38d52143EE50ac839D20696b' }))
                 .to.equal(true);
         expect(node.db.evalOwner(
-            "/test/test_owner/some/path/deeper/path", 'write_rule',
+            "/apps/test/test_owner/some/path/deeper/path", 'write_rule',
             { addr: '0x08Aed7AF9354435c38d52143EE50ac839D20696b' }))
                 .to.equal(false);
       })
 
       it("when evaluating existing owner without matching address", () => {
-        expect(node.db.evalOwner("/test/test_owner/some/path", 'write_owner', { addr: 'other' }))
+        expect(node.db.evalOwner("/apps/test/test_owner/some/path", 'write_owner', { addr: 'other' }))
             .to.equal(false);
-        expect(node.db.evalOwner("/test/test_owner/some/path", 'write_rule', { addr: 'other' }))
+        expect(node.db.evalOwner("/apps/test/test_owner/some/path", 'write_rule', { addr: 'other' }))
             .to.equal(true);
         expect(node.db.evalOwner(
-            "/test/test_owner/some/path/deeper/path", 'write_owner', { addr: 'other' }))
+            "/apps/test/test_owner/some/path/deeper/path", 'write_owner', { addr: 'other' }))
                 .to.equal(false);
         expect(node.db.evalOwner(
-            "/test/test_owner/some/path/deeper/path", 'write_rule', { addr: 'other' }))
+            "/apps/test/test_owner/some/path/deeper/path", 'write_rule', { addr: 'other' }))
                 .to.equal(true);
       })
 
       it("when evaluating closest owner", () => {
         expect(node.db.evalOwner(
-            "/test/test_owner/some/path/deeper", 'write_owner',
+            "/apps/test/test_owner/some/path/deeper", 'write_owner',
             { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' }))
                 .to.equal(true);
         expect(node.db.evalOwner(
-            "/test/test_owner/some/path/deeper", 'write_rule',
+            "/apps/test/test_owner/some/path/deeper", 'write_rule',
             { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' }))
                 .to.equal(false);
         expect(node.db.evalOwner(
-            "/test/test_owner/some/path/deeper", 'write_owner', { addr: 'other' }))
+            "/apps/test/test_owner/some/path/deeper", 'write_owner', { addr: 'other' }))
                 .to.equal(false);
         expect(node.db.evalOwner(
-            "/test/test_owner/some/path/deeper", 'write_rule', { addr: 'other' }))
+            "/apps/test/test_owner/some/path/deeper", 'write_rule', { addr: 'other' }))
                 .to.equal(true);
       })
     })
@@ -806,42 +1067,42 @@ describe("DB operations", () => {
         assert.deepEqual(node.db.get([
           {
             // Default type: GET_VALUE
-            ref: "/value/other/path",
+            ref: "/apps/value/other/path",
           },
           {
             type: "GET_RULE",
-            ref: "/rule/other/path",
+            ref: "/apps/rule/other/path",
           },
           {
             type: "GET_FUNCTION",
-            ref: "/function/other/path",
+            ref: "/apps/function/other/path",
           },
           {
             type: "GET_OWNER",
-            ref: "/owner/other/path",
+            ref: "/apps/owner/other/path",
           },
           {
             type: "MATCH_FUNCTION",
-            ref: "/test/test_function/some/path/deeper",
+            ref: "/apps/test/test_function/some/path/deeper",
           },
           {
             type: "MATCH_RULE",
-            ref: "/test/test_rule/some/path/deeper",
+            ref: "/apps/test/test_rule/some/path/deeper",
           },
           {
             type: "MATCH_OWNER",
-            ref: "/test/test_owner/some/path/deeper",
+            ref: "/apps/test/test_owner/some/path/deeper",
           },
           {
             type: "EVAL_RULE",
-            ref: "/rule/other/path",
+            ref: "/apps/rule/other/path",
             value: "value",
             address: "abcd",
             timestamp: Date.now(),
           },
           {
             type: "EVAL_OWNER",
-            ref: "/owner/other/path",
+            ref: "/apps/owner/other/path",
             permission: "write_rule",
             address: "abcd",
             timestamp: Date.now(),
@@ -853,13 +1114,13 @@ describe("DB operations", () => {
           null,
           {
             "matched_path": {
-              "target_path": "/test/test_function/some/path/deeper",
-              "ref_path": "/test/test_function/some/path/deeper",
+              "target_path": "/apps/test/test_function/some/path/deeper",
+              "ref_path": "/apps/test/test_function/some/path/deeper",
               "path_vars": {},
             },
             "matched_config": {
               "config": null,
-              "path": "/test/test_function/some/path/deeper"
+              "path": "/apps/test/test_function/some/path/deeper"
             },
             "subtree_configs": [
               {
@@ -877,24 +1138,28 @@ describe("DB operations", () => {
           },
           {
             "matched_path": {
-              "target_path": "/test/test_rule/some/path/deeper",
-              "ref_path": "/test/test_rule/some/path/deeper",
+              "target_path": "/apps/test/test_rule/some/path/deeper",
+              "ref_path": "/apps/test/test_rule/some/path/deeper",
               "path_vars": {},
             },
             "matched_config": {
-              "config": "auth.addr === 'abcd'",
-              "path": "/test/test_rule/some/path"
+              "config": {
+                "write": "auth.addr === 'abcd'"
+              },
+              "path": "/apps/test/test_rule/some/path"
             },
             "subtree_configs": [
               {
-                "config": "auth.addr === 'ijkl'",
+                "config": {
+                  "write": "auth.addr === 'ijkl'"
+                },
                 "path": "/path"
               }
             ]
           },
           {
             "matched_path": {
-              "target_path": "/test/test_owner/some/path/deeper"
+              "target_path": "/apps/test/test_owner/some/path/deeper"
             },
             "matched_config": {
               "config": {
@@ -913,7 +1178,7 @@ describe("DB operations", () => {
                   }
                 }
               },
-              "path": "/test/test_owner/some/path"
+              "path": "/apps/test/test_owner/some/path"
             }
           },
           false,
@@ -925,42 +1190,42 @@ describe("DB operations", () => {
         assert.deepEqual(node.db.get([
           {
             // Default type: GET_VALUE
-            ref: "/test/nested/far/down",
+            ref: "/apps/test/nested/far/down",
           },
           {
             type: "GET_RULE",
-            ref: "/test/test_rule/some/path",
+            ref: "/apps/test/test_rule/some/path",
           },
           {
             type: "GET_FUNCTION",
-            ref: "/test/test_function/some/path",
+            ref: "/apps/test/test_function/some/path",
           },
           {
             type: "GET_OWNER",
-            ref: "/test/test_owner/some/path",
+            ref: "/apps/test/test_owner/some/path",
           },
           {
             type: "MATCH_FUNCTION",
-            ref: "/test/test_function/some/path",
+            ref: "/apps/test/test_function/some/path",
           },
           {
             type: "MATCH_RULE",
-            ref: "/test/test_rule/some/path",
+            ref: "/apps/test/test_rule/some/path",
           },
           {
             type: "MATCH_OWNER",
-            ref: "/test/test_owner/some/path",
+            ref: "/apps/test/test_owner/some/path",
           },
           {
             type: "EVAL_RULE",
-            ref: "/test/test_rule/some/path",
+            ref: "/apps/test/test_rule/some/path",
             value: "value",
             address: "abcd",
             timestamp: Date.now(),
           },
           {
             type: "EVAL_OWNER",
-            ref: "/test/test_owner/some/path",
+            ref: "/apps/test/test_owner/some/path",
             permission: "write_owner",
             address: "0x09A0d53FDf1c36A131938eb379b98910e55EEfe1",
             timestamp: Date.now(),
@@ -968,10 +1233,14 @@ describe("DB operations", () => {
         ]), [
           456,
           {
-            ".write": "auth.addr === 'abcd'",
+            ".rule": {
+              "write": "auth.addr === 'abcd'"
+            },
             "deeper": {
               "path": {
-                ".write": "auth.addr === 'ijkl'"
+                ".rule": {
+                  "write": "auth.addr === 'ijkl'"
+                }
               }
             }
           },
@@ -1037,8 +1306,8 @@ describe("DB operations", () => {
           },
           {
             "matched_path": {
-              "target_path": "/test/test_function/some/path",
-              "ref_path": "/test/test_function/some/path",
+              "target_path": "/apps/test/test_function/some/path",
+              "ref_path": "/apps/test/test_function/some/path",
               "path_vars": {},
             },
             "matched_config": {
@@ -1050,7 +1319,7 @@ describe("DB operations", () => {
                   "service_name": "https://ainetwork.ai"
                 }
               },
-              "path": "/test/test_function/some/path"
+              "path": "/apps/test/test_function/some/path"
             },
             "subtree_configs": [
               {
@@ -1068,24 +1337,28 @@ describe("DB operations", () => {
           },
           {
             "matched_path": {
-              "target_path": "/test/test_rule/some/path",
-              "ref_path": "/test/test_rule/some/path",
+              "target_path": "/apps/test/test_rule/some/path",
+              "ref_path": "/apps/test/test_rule/some/path",
               "path_vars": {},
             },
             "matched_config": {
-              "config": "auth.addr === 'abcd'",
-              "path": "/test/test_rule/some/path"
+              "config": {
+                "write": "auth.addr === 'abcd'"
+              },
+              "path": "/apps/test/test_rule/some/path"
             },
             "subtree_configs": [
               {
-                "config": "auth.addr === 'ijkl'",
+                "config": {
+                  "write": "auth.addr === 'ijkl'"
+                },
                 "path": "/deeper/path"
               }
             ]
           },
           {
             "matched_path": {
-              "target_path": "/test/test_owner/some/path"
+              "target_path": "/apps/test/test_owner/some/path"
             },
             "matched_config": {
               "config": {
@@ -1104,7 +1377,7 @@ describe("DB operations", () => {
                   }
                 }
               },
-              "path": "/test/test_owner/some/path"
+              "path": "/apps/test/test_owner/some/path"
             }
           },
           true,
@@ -1118,204 +1391,204 @@ describe("DB operations", () => {
     describe("setValue()", () => {
       it("when overwriting nested value", () => {
         const newValue = {"new": 12345}
-        expect(node.db.setValue("test/nested/far/down", newValue).code).to.equal(0)
-        assert.deepEqual(node.db.getValue("test/nested/far/down"), newValue)
+        expect(node.db.setValue("/apps/test/nested/far/down", newValue).code).to.equal(0)
+        assert.deepEqual(node.db.getValue("/apps/test/nested/far/down"), newValue)
       })
 
       it("when creating new path in database", () => {
         const newValue = 12345
-        expect(node.db.setValue("test/new/unchartered/nested/path", newValue).code).to.equal(0)
-        expect(node.db.getValue("test/new/unchartered/nested/path")).to.equal(newValue)
+        expect(node.db.setValue("/apps/test/new/unchartered/nested/path", newValue).code).to.equal(0)
+        expect(node.db.getValue("/apps/test/new/unchartered/nested/path")).to.equal(newValue)
       })
 
       it("when writing invalid object", () => {
-        assert.deepEqual(node.db.setValue("test/unchartered/nested/path2", {array: []}), {
+        assert.deepEqual(node.db.setValue("/apps/test/unchartered/nested/path2", {array: []}), {
           "code": 101,
           "error_message": "Invalid object for states: /array",
-          "gas_amount": 0
+          "bandwidth_gas_amount": 1
         });
-        expect(node.db.getValue("test/unchartered/nested/path2")).to.equal(null)
+        expect(node.db.getValue("/apps/test/unchartered/nested/path2")).to.equal(null)
 
-        assert.deepEqual(node.db.setValue("test/unchartered/nested/path2", {'.': 'x'}), {
+        assert.deepEqual(node.db.setValue("/apps/test/unchartered/nested/path2", {'.': 'x'}), {
           "code": 101,
           "error_message": "Invalid object for states: /.",
-          "gas_amount": 0
+          "bandwidth_gas_amount": 1
         });
-        expect(node.db.getValue("test/unchartered/nested/path2")).to.equal(null)
+        expect(node.db.getValue("/apps/test/unchartered/nested/path2")).to.equal(null)
 
-        assert.deepEqual(node.db.setValue("test/unchartered/nested/path2", {'$': 'x'}), {
+        assert.deepEqual(node.db.setValue("/apps/test/unchartered/nested/path2", {'$': 'x'}), {
           "code": 101,
           "error_message": "Invalid object for states: /$",
-          "gas_amount": 0
+          "bandwidth_gas_amount": 1
         });
-        expect(node.db.getValue("test/unchartered/nested/path2")).to.equal(null)
+        expect(node.db.getValue("/apps/test/unchartered/nested/path2")).to.equal(null)
 
-        assert.deepEqual(node.db.setValue("test/unchartered/nested/path2", {'*a': 'x'}), {
+        assert.deepEqual(node.db.setValue("/apps/test/unchartered/nested/path2", {'*a': 'x'}), {
           "code": 101,
           "error_message": "Invalid object for states: /*a",
-          "gas_amount": 0
+          "bandwidth_gas_amount": 1
         });
-        expect(node.db.getValue("test/unchartered/nested/path2")).to.equal(null)
+        expect(node.db.getValue("/apps/test/unchartered/nested/path2")).to.equal(null)
 
-        assert.deepEqual(node.db.setValue("test/unchartered/nested/path2", {'a*': 'x'}), {
+        assert.deepEqual(node.db.setValue("/apps/test/unchartered/nested/path2", {'a*': 'x'}), {
           "code": 101,
           "error_message": "Invalid object for states: /a*",
-          "gas_amount": 0
+          "bandwidth_gas_amount": 1
         });
-        expect(node.db.getValue("test/unchartered/nested/path2")).to.equal(null)
+        expect(node.db.getValue("/apps/test/unchartered/nested/path2")).to.equal(null)
       })
 
       it("when writing with invalid path", () => {
-        assert.deepEqual(node.db.setValue("test/new/unchartered/nested/.", 12345), {
+        assert.deepEqual(node.db.setValue("/apps/test/new/unchartered/nested/.", 12345), {
           "code": 102,
-          "error_message": "Invalid path: /test/new/unchartered/nested/.",
-          "gas_amount": 0
+          "error_message": "Invalid path: /apps/test/new/unchartered/nested/.",
+          "bandwidth_gas_amount": 1
         });
-        assert.deepEqual(node.db.setValue("test/new/unchartered/nested/$", 12345), {
+        assert.deepEqual(node.db.setValue("/apps/test/new/unchartered/nested/$", 12345), {
           "code": 102,
-          "error_message": "Invalid path: /test/new/unchartered/nested/$",
-          "gas_amount": 0
+          "error_message": "Invalid path: /apps/test/new/unchartered/nested/$",
+          "bandwidth_gas_amount": 1
         });
-        assert.deepEqual(node.db.setValue("test/new/unchartered/nested/a*", 12345), {
+        assert.deepEqual(node.db.setValue("/apps/test/new/unchartered/nested/a*", 12345), {
           "code": 102,
-          "error_message": "Invalid path: /test/new/unchartered/nested/a*",
-          "gas_amount": 0
+          "error_message": "Invalid path: /apps/test/new/unchartered/nested/a*",
+          "bandwidth_gas_amount": 1
         });
-        assert.deepEqual(node.db.setValue("test/new/unchartered/nested/*a", 12345), {
+        assert.deepEqual(node.db.setValue("/apps/test/new/unchartered/nested/*a", 12345), {
           "code": 102,
-          "error_message": "Invalid path: /test/new/unchartered/nested/*a",
-          "gas_amount": 0
+          "error_message": "Invalid path: /apps/test/new/unchartered/nested/*a",
+          "bandwidth_gas_amount": 1
         });
-        assert.deepEqual(node.db.setValue("test/new/unchartered/nested/#", 12345), {
+        assert.deepEqual(node.db.setValue("/apps/test/new/unchartered/nested/#", 12345), {
           "code": 102,
-          "error_message": "Invalid path: /test/new/unchartered/nested/#",
-          "gas_amount": 0
+          "error_message": "Invalid path: /apps/test/new/unchartered/nested/#",
+          "bandwidth_gas_amount": 1
         });
-        assert.deepEqual(node.db.setValue("test/new/unchartered/nested/{", 12345), {
+        assert.deepEqual(node.db.setValue("/apps/test/new/unchartered/nested/{", 12345), {
           "code": 102,
-          "error_message": "Invalid path: /test/new/unchartered/nested/{",
-          "gas_amount": 0
+          "error_message": "Invalid path: /apps/test/new/unchartered/nested/{",
+          "bandwidth_gas_amount": 1
         });
-        assert.deepEqual(node.db.setValue("test/new/unchartered/nested/}", 12345), {
+        assert.deepEqual(node.db.setValue("/apps/test/new/unchartered/nested/}", 12345), {
           "code": 102,
-          "error_message": "Invalid path: /test/new/unchartered/nested/}",
-          "gas_amount": 0
+          "error_message": "Invalid path: /apps/test/new/unchartered/nested/}",
+          "bandwidth_gas_amount": 1
         });
-        assert.deepEqual(node.db.setValue("test/new/unchartered/nested/[", 12345), {
+        assert.deepEqual(node.db.setValue("/apps/test/new/unchartered/nested/[", 12345), {
           "code": 102,
-          "error_message": "Invalid path: /test/new/unchartered/nested/[",
-          "gas_amount": 0
+          "error_message": "Invalid path: /apps/test/new/unchartered/nested/[",
+          "bandwidth_gas_amount": 1
         });
-        assert.deepEqual(node.db.setValue("test/new/unchartered/nested/]", 12345), {
+        assert.deepEqual(node.db.setValue("/apps/test/new/unchartered/nested/]", 12345), {
           "code": 102,
-          "error_message": "Invalid path: /test/new/unchartered/nested/]",
-          "gas_amount": 0
+          "error_message": "Invalid path: /apps/test/new/unchartered/nested/]",
+          "bandwidth_gas_amount": 1
         });
-        assert.deepEqual(node.db.setValue("test/new/unchartered/nested/\x00", 12345), {
+        assert.deepEqual(node.db.setValue("/apps/test/new/unchartered/nested/\x00", 12345), {
           "code": 102,
-          "error_message": "Invalid path: /test/new/unchartered/nested/\x00",
-          "gas_amount": 0
+          "error_message": "Invalid path: /apps/test/new/unchartered/nested/\x00",
+          "bandwidth_gas_amount": 1
         });
-        assert.deepEqual(node.db.setValue("test/new/unchartered/nested/\x1F", 12345), {
+        assert.deepEqual(node.db.setValue("/apps/test/new/unchartered/nested/\x1F", 12345), {
           "code": 102,
-          "error_message": "Invalid path: /test/new/unchartered/nested/\x1F",
-          "gas_amount": 0
+          "error_message": "Invalid path: /apps/test/new/unchartered/nested/\x1F",
+          "bandwidth_gas_amount": 1
         });
-        assert.deepEqual(node.db.setValue("test/new/unchartered/nested/\x7F", 12345), {
+        assert.deepEqual(node.db.setValue("/apps/test/new/unchartered/nested/\x7F", 12345), {
           "code": 102,
-          "error_message": "Invalid path: /test/new/unchartered/nested/\x7F",
-          "gas_amount": 0
+          "error_message": "Invalid path: /apps/test/new/unchartered/nested/\x7F",
+          "bandwidth_gas_amount": 1
         });
       })
 
       it("when writing with non-writable path with sharding", () => {
-        assert.deepEqual(node.db.setValue("test/shards/enabled_shard", 20), {
+        assert.deepEqual(node.db.setValue("/apps/test/shards/enabled_shard", 20), {
           "code": 104,
-          "error_message": "Non-writable path with shard config: /values/test/shards/enabled_shard",
-          "gas_amount": 0
+          "error_message": "Non-writable path with shard config: /values/apps/test/shards/enabled_shard",
+          "bandwidth_gas_amount": 1
         });
-        assert.deepEqual(node.db.setValue("test/shards/enabled_shard/path", 20), {
+        assert.deepEqual(node.db.setValue("/apps/test/shards/enabled_shard/path", 20), {
           "code": 104,
-          "error_message": "Non-writable path with shard config: /values/test/shards/enabled_shard",
-          "gas_amount": 0
+          "error_message": "Non-writable path with shard config: /values/apps/test/shards/enabled_shard",
+          "bandwidth_gas_amount": 1
         });
       })
 
       it("when writing with writable path with sharding", () => {
-        expect(node.db.setValue("test/shards/disabled_shard", 20).code).to.equal(0);
-        expect(node.db.getValue("test/shards/disabled_shard")).to.equal(20)
-        expect(node.db.setValue("test/shards/disabled_shard/path", 20).code).to.equal(0);
-        expect(node.db.getValue("test/shards/disabled_shard/path")).to.equal(20)
+        expect(node.db.setValue("/apps/test/shards/disabled_shard", 20).code).to.equal(0);
+        expect(node.db.getValue("/apps/test/shards/disabled_shard")).to.equal(20)
+        expect(node.db.setValue("/apps/test/shards/disabled_shard/path", 20).code).to.equal(0);
+        expect(node.db.getValue("/apps/test/shards/disabled_shard/path")).to.equal(20)
       })
     })
 
     describe("incValue()", () => {
       it("when increasing value successfully", () => {
-        expect(node.db.incValue("test/increment/value", 10).code).to.equal(0)
-        expect(node.db.getValue("test/increment/value")).to.equal(30)
+        expect(node.db.incValue("/apps/test/increment/value", 10).code).to.equal(0)
+        expect(node.db.getValue("/apps/test/increment/value")).to.equal(30)
       })
 
       it("returning error code and leaving value unchanged if delta is not numerical", () => {
-        expect(node.db.incValue("test/increment/value", '10').code).to.equal(201)
-        expect(node.db.getValue("test/increment/value")).to.equal(20)
+        expect(node.db.incValue("/apps/test/increment/value", '10').code).to.equal(201)
+        expect(node.db.getValue("/apps/test/increment/value")).to.equal(20)
       })
 
       it("returning error code and leaving value unchanged if path is not numerical", () => {
-        expect(node.db.incValue("test/ai/foo", 10).code).to.equal(201)
-        expect(node.db.getValue("test/ai/foo")).to.equal("bar")
+        expect(node.db.incValue("/apps/test/ai/foo", 10).code).to.equal(201)
+        expect(node.db.getValue("/apps/test/ai/foo")).to.equal("bar")
       })
 
       it("creating and increasing given path from 0 if not currently in database", () => {
-        node.db.incValue("test/completely/new/path/test", 100);
-        expect(node.db.getValue("test/completely/new/path/test")).to.equal(100)
+        node.db.incValue("/apps/test/completely/new/path/test", 100);
+        expect(node.db.getValue("/apps/test/completely/new/path/test")).to.equal(100)
       })
 
       it("returning error code with non-writable path with sharding", () => {
-        assert.deepEqual(node.db.incValue("test/shards/enabled_shard/path", 5), {
+        assert.deepEqual(node.db.incValue("/apps/test/shards/enabled_shard/path", 5), {
           "code": 104,
-          "error_message": "Non-writable path with shard config: /values/test/shards/enabled_shard",
-          "gas_amount": 0
+          "error_message": "Non-writable path with shard config: /values/apps/test/shards/enabled_shard",
+          "bandwidth_gas_amount": 1
         });
       })
 
       it("when increasing with writable path with sharding", () => {
-        expect(node.db.incValue("test/shards/disabled_shard/path", 5).code).to.equal(0);
-        expect(node.db.getValue("test/shards/disabled_shard/path")).to.equal(15)
+        expect(node.db.incValue("/apps/test/shards/disabled_shard/path", 5).code).to.equal(0);
+        expect(node.db.getValue("/apps/test/shards/disabled_shard/path")).to.equal(15)
       })
     })
 
     describe("decValue()", () => {
       it("when decreasing value successfully", () => {
-        expect(node.db.decValue("test/decrement/value", 10).code).to.equal(0)
-        expect(node.db.getValue("test/decrement/value")).to.equal(10)
+        expect(node.db.decValue("/apps/test/decrement/value", 10).code).to.equal(0)
+        expect(node.db.getValue("/apps/test/decrement/value")).to.equal(10)
       })
 
       it("returning error code and leaving value unchanged if delta is not numerical", () => {
-        expect(node.db.decValue("test/decrement/value", '10').code).to.equal(301)
-        expect(node.db.getValue("test/decrement/value")).to.equal(20)
+        expect(node.db.decValue("/apps/test/decrement/value", '10').code).to.equal(301)
+        expect(node.db.getValue("/apps/test/decrement/value")).to.equal(20)
       })
 
       it("returning error code and leaving value unchanged if path is not numerical", () => {
-        expect(node.db.decValue("test/ai/foo", 10).code).to.equal(301)
-        expect(node.db.getValue("test/ai/foo")).to.equal("bar")
+        expect(node.db.decValue("/apps/test/ai/foo", 10).code).to.equal(301)
+        expect(node.db.getValue("/apps/test/ai/foo")).to.equal("bar")
       })
 
       it("creating and decreasing given path from 0 if not currently in database", () => {
-        node.db.decValue("test/completely/new/path/test", 100);
-        expect(node.db.getValue("test/completely/new/path/test")).to.equal(-100)
+        node.db.decValue("/apps/test/completely/new/path/test", 100);
+        expect(node.db.getValue("/apps/test/completely/new/path/test")).to.equal(-100)
       })
 
       it("returning error code with non-writable path with sharding", () => {
-        assert.deepEqual(node.db.decValue("test/shards/enabled_shard/path", 5), {
+        assert.deepEqual(node.db.decValue("/apps/test/shards/enabled_shard/path", 5), {
           "code": 104,
-          "error_message": "Non-writable path with shard config: /values/test/shards/enabled_shard",
-          "gas_amount": 0
+          "error_message": "Non-writable path with shard config: /values/apps/test/shards/enabled_shard",
+          "bandwidth_gas_amount": 1
         });
       })
 
       it("when increasing with writable path with sharding", () => {
-        expect(node.db.decValue("test/shards/disabled_shard/path", 5).code).to.equal(0);
-        expect(node.db.getValue("test/shards/disabled_shard/path")).to.equal(5)
+        expect(node.db.decValue("/apps/test/shards/disabled_shard/path", 5).code).to.equal(0);
+        expect(node.db.getValue("/apps/test/shards/disabled_shard/path")).to.equal(5)
       })
     })
 
@@ -1331,9 +1604,9 @@ describe("DB operations", () => {
             }
           }
         };
-        expect(node.db.setFunction("/test/test_function/some/path", functionConfig).code)
+        expect(node.db.setFunction("/apps/test/test_function/some/path", functionConfig).code)
             .to.equal(0);
-        assert.deepEqual(node.db.getFunction("/test/test_function/some/path"), {
+        assert.deepEqual(node.db.getFunction("/apps/test/test_function/some/path"), {
           ".function": {
             "fid": {
               "event_listener": "https://events.ainetwork.ai/trigger2",  // modified
@@ -1368,42 +1641,42 @@ describe("DB operations", () => {
             }
           }
         };
-        expect(node.db.setFunction("/test/test_function/some/$variable/path", functionConfig).code)
+        expect(node.db.setFunction("/apps/test/test_function/some/$variable/path", functionConfig).code)
             .to.equal(0);
         assert.deepEqual(
-            node.db.getFunction("/test/test_function/some/$variable/path"), functionConfig)
+            node.db.getFunction("/apps/test/test_function/some/$variable/path"), functionConfig)
       })
 
       it("when writing invalid object", () => {
-        assert.deepEqual(node.db.setFunction("/test/test_function/some/path2", {array: []}), {
+        assert.deepEqual(node.db.setFunction("/apps/test/test_function/some/path2", {array: []}), {
           "code": 401,
           "error_message": "Invalid object for states: /array",
-          "gas_amount": 0
+          "bandwidth_gas_amount": 1
         });
-        expect(node.db.getFunction("test/new2/unchartered/nested/path2")).to.equal(null)
+        expect(node.db.getFunction("/apps/test/new2/unchartered/nested/path2")).to.equal(null)
 
-        assert.deepEqual(node.db.setFunction("/test/test_function/some/path2", {'.': 'x'}), {
+        assert.deepEqual(node.db.setFunction("/apps/test/test_function/some/path2", {'.': 'x'}), {
           "code": 401,
           "error_message": "Invalid object for states: /.",
-          "gas_amount": 0
+          "bandwidth_gas_amount": 1
         });
-        expect(node.db.getFunction("test/new2/unchartered/nested/path2")).to.equal(null)
+        expect(node.db.getFunction("/apps/test/new2/unchartered/nested/path2")).to.equal(null)
       })
 
       it("when writing invalid function tree", () => {
-        const functionTreeBefore = node.db.getOwner("/test/test_function/some/path");
+        const functionTreeBefore = node.db.getOwner("/apps/test/test_function/some/path");
         assert.deepEqual(node.db.setFunction(
-            "/test/test_function/some/path", { ".function": null }), {
+            "/apps/test/test_function/some/path", { ".function": null }), {
           "code": 405,
           "error_message": "Invalid function tree: /.function",
-          "gas_amount": 0
+          "bandwidth_gas_amount": 1
         });
-        assert.deepEqual(node.db.getOwner("/test/test_function/some/path"), functionTreeBefore);
+        assert.deepEqual(node.db.getOwner("/apps/test/test_function/some/path"), functionTreeBefore);
       })
 
       it("when writing with invalid path", () => {
         assert.deepEqual(node.db.setFunction(
-            "/test/test_function/some/path/.", {
+            "/apps/test/test_function/some/path/.", {
               ".function": {
                 "fid": {
                   "event_listener": "https://events.ainetwork.ai/trigger2",
@@ -1414,59 +1687,76 @@ describe("DB operations", () => {
               }
             }), {
           "code": 402,
-          "error_message": "Invalid path: /test/test_function/some/path/.",
-          "gas_amount": 0
+          "error_message": "Invalid path: /apps/test/test_function/some/path/.",
+          "bandwidth_gas_amount": 1
         });
       })
     })
 
     describe("setRule()", () => {
       it("when overwriting existing rule config with simple path", () => {
-        const ruleConfig = {".write": "other rule config"};
-        expect(node.db.setRule("/test/test_rule/some/path", ruleConfig).code).to.equal(0);
-        assert.deepEqual(node.db.getRule("/test/test_rule/some/path"), ruleConfig)
+        const ruleConfig = {
+          ".rule": {
+            "write": "other rule config"
+          }
+        };
+        expect(node.db.setRule("/apps/test/test_rule/some/path", ruleConfig).code).to.equal(0);
+        assert.deepEqual(node.db.getRule("/apps/test/test_rule/some/path"), ruleConfig)
       })
 
       it("when writing with variable path", () => {
-        const ruleConfig = {".write": "other rule config"};
-        expect(node.db.setRule("/test/test_rule/some/$variable/path", ruleConfig).code)
+        const ruleConfig = {
+          ".rule": {
+            "write": "other rule config"
+          }
+        };
+        expect(node.db.setRule("/apps/test/test_rule/some/$variable/path", ruleConfig).code)
             .to.equal(0)
-        assert.deepEqual(node.db.getRule("/test/test_rule/some/$variable/path"), ruleConfig)
+        assert.deepEqual(node.db.getRule("/apps/test/test_rule/some/$variable/path"), ruleConfig)
       })
 
       it("when writing invalid object", () => {
-        assert.deepEqual(node.db.setRule("/test/test_rule/some/path2", {array: []}), {
+        assert.deepEqual(node.db.setRule("/apps/test/test_rule/some/path2", {array: []}), {
           "code": 501,
           "error_message": "Invalid object for states: /array",
-          "gas_amount": 0
+          "bandwidth_gas_amount": 1
         });
-        expect(node.db.getRule("/test/test_rule/some/path2")).to.equal(null)
+        expect(node.db.getRule("/apps/test/test_rule/some/path2")).to.equal(null)
 
-        assert.deepEqual(node.db.setRule("/test/test_rule/some/path2", {'.': 'x'}), {
+        assert.deepEqual(node.db.setRule("/apps/test/test_rule/some/path2", {'.': 'x'}), {
           "code": 501,
           "error_message": "Invalid object for states: /.",
-          "gas_amount": 0
+          "bandwidth_gas_amount": 1
         });
-        expect(node.db.getRule("/test/test_rule/some/path2")).to.equal(null)
+        expect(node.db.getRule("/apps/test/test_rule/some/path2")).to.equal(null)
       })
 
       it("when writing invalid rule tree", () => {
-        const ruleTreeBefore = node.db.getRule("/test/test_rule/some/path");
+        const ruleTreeBefore = node.db.getRule("/apps/test/test_rule/some/path");
         assert.deepEqual(node.db.setRule(
-            "/test/test_rule/some/path", { ".write": null }), {
+            "/apps/test/test_rule/some/path",
+            {
+              ".rule": {
+                "write": null
+              }
+            }), {
           "code": 504,
-          "error_message": "Invalid rule tree: /.write",
-          "gas_amount": 0
+          "error_message": "Invalid rule tree: /.rule/write",
+          "bandwidth_gas_amount": 1
         });
-        assert.deepEqual(node.db.getRule("/test/test_rule/some/path"), ruleTreeBefore);
+        assert.deepEqual(node.db.getRule("/apps/test/test_rule/some/path"), ruleTreeBefore);
       })
 
       it("when writing with invalid path", () => {
-        assert.deepEqual(node.db.setRule("/test/test_rule/some/path/.",
-           { ".write": "some rule config" } ), {
+        assert.deepEqual(node.db.setRule("/apps/test/test_rule/some/path/.",
+            {
+              ".rule": {
+                "write": "some rule config"
+              }
+            }), {
           "code": 502,
-          "error_message": "Invalid path: /test/test_rule/some/path/.",
-          "gas_amount": 0
+          "error_message": "Invalid path: /apps/test/test_rule/some/path/.",
+          "bandwidth_gas_amount": 1
         });
       })
     })
@@ -1498,55 +1788,55 @@ describe("DB operations", () => {
           }
         };
         assert.deepEqual(node.db.setOwner(
-            "/test/test_owner/some/path", ownerTree,
+            "/apps/test/test_owner/some/path", ownerTree,
             { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' }), {
           "code": 0,
-          "gas_amount": 1
+          "bandwidth_gas_amount": 1
         });
-        assert.deepEqual(node.db.getOwner("/test/test_owner/some/path"), ownerTree)
+        assert.deepEqual(node.db.getOwner("/apps/test/test_owner/some/path"), ownerTree)
       })
 
       it("when writing invalid object", () => {
-        assert.deepEqual(node.db.setOwner("/test/test_owner/some/path2", {array: []}), {
+        assert.deepEqual(node.db.setOwner("/apps/test/test_owner/some/path2", {array: []}), {
           "code": 601,
           "error_message": "Invalid object for states: /array",
-          "gas_amount": 0
+          "bandwidth_gas_amount": 1
         });
-        expect(node.db.getOwner("/test/test_owner/some/path2")).to.equal(null)
+        expect(node.db.getOwner("/apps/test/test_owner/some/path2")).to.equal(null)
 
-        assert.deepEqual(node.db.setOwner("/test/test_owner/some/path2", {'.': 'x'}), {
+        assert.deepEqual(node.db.setOwner("/apps/test/test_owner/some/path2", {'.': 'x'}), {
           "code": 601,
           "error_message": "Invalid object for states: /.",
-          "gas_amount": 0
+          "bandwidth_gas_amount": 1
         });
-        expect(node.db.getOwner("/test/test_owner/some/path2")).to.equal(null)
+        expect(node.db.getOwner("/apps/test/test_owner/some/path2")).to.equal(null)
       })
 
       it("when writing invalid owner tree", () => {
-        const ownerTreeBefore = node.db.getOwner("/test/test_owner/some/path");
-        assert.deepEqual(node.db.setOwner("/test/test_owner/some/path", {
+        const ownerTreeBefore = node.db.getOwner("/apps/test/test_owner/some/path");
+        assert.deepEqual(node.db.setOwner("/apps/test/test_owner/some/path", {
           ".owner": "invalid owners config"
         }, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' }), {
           "code": 604,
           "error_message": "Invalid owner tree: /.owner",
-          "gas_amount": 0
+          "bandwidth_gas_amount": 1
         });
-        assert.deepEqual(node.db.getOwner("/test/test_owner/some/path"), ownerTreeBefore);
+        assert.deepEqual(node.db.getOwner("/apps/test/test_owner/some/path"), ownerTreeBefore);
 
-        assert.deepEqual(node.db.setOwner("/test/test_owner/some/path", {
+        assert.deepEqual(node.db.setOwner("/apps/test/test_owner/some/path", {
           ".owner": {
             "owners": "invalid owners config"
           }
         }, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' }), {
           "code": 604,
           "error_message": "Invalid owner tree: /.owner/owners",
-          "gas_amount": 0
+          "bandwidth_gas_amount": 1
         });
-        assert.deepEqual(node.db.getOwner("/test/test_owner/some/path"), ownerTreeBefore);
+        assert.deepEqual(node.db.getOwner("/apps/test/test_owner/some/path"), ownerTreeBefore);
       })
 
       it("when writing with invalid path", () => {
-        assert.deepEqual(node.db.setOwner("/test/test_owner/some/path/.", {
+        assert.deepEqual(node.db.setOwner("/apps/test/test_owner/some/path/.", {
           ".owner": {
             "owners": {
               "*": {
@@ -1559,8 +1849,8 @@ describe("DB operations", () => {
           }
         }, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' }), {
           "code": 602,
-          "error_message": "Invalid path: /test/test_owner/some/path/.",
-          "gas_amount": 0
+          "error_message": "Invalid path: /apps/test/test_owner/some/path/.",
+          "bandwidth_gas_amount": 1
         });
       })
     })
@@ -1569,33 +1859,33 @@ describe("DB operations", () => {
       it("when successful", () => {
         assert.deepEqual(node.db.executeSingleSetOperation({
           // Default type: SET_VALUE
-          ref: "test/nested/far/down",
+          ref: "/apps/test/nested/far/down",
           value: {
             "new": 12345
           }
         }, { addr: 'abcd' }, null, { extra: { executed_at: 1234567890000 }}), {
           "code": 0,
-          "gas_amount": 1
+          "bandwidth_gas_amount": 1
         });
-        assert.deepEqual(node.db.getValue("test/nested/far/down"), { "new": 12345 })
+        assert.deepEqual(node.db.getValue("/apps/test/nested/far/down"), { "new": 12345 })
       })
 
       it("returning error code and leaving value unchanged when it fails", () => {
         assert.deepEqual(node.db.executeSingleSetOperation({
           type: "INC_VALUE",
-          ref: "test/ai/foo",
+          ref: "/apps/test/ai/foo",
           value: 10
         }), {
           "code": 201,
           "error_message": "Not a number type: bar or 10",
-          "gas_amount": 0
+          "bandwidth_gas_amount": 1
         })
-        expect(node.db.getValue("test/ai/foo")).to.equal("bar")
+        expect(node.db.getValue("/apps/test/ai/foo")).to.equal("bar")
       })
 
       it("when successful with function triggering", () => {
-        const valuePath = '/test/test_function_triggering/allowed_path/value';
-        const functionResultPath = '/test/test_function_triggering/allowed_path/.last_tx/value';
+        const valuePath = '/apps/test/test_function_triggering/allowed_path/value';
+        const functionResultPath = '/apps/test/test_function_triggering/allowed_path/.last_tx/value';
         const value = 'some value';
         const timestamp = 1234567890000;
 
@@ -1616,14 +1906,18 @@ describe("DB operations", () => {
             type: 'SET_RULE',
             ref: valuePath,
             value: {
-              ".write": true,
+              ".rule": {
+                "write": true
+              }
             }
           },
           {
             type: 'SET_RULE',
             ref: functionResultPath,
             value: {
-              ".write": true,  // Allow all.
+              ".rule": {
+                "write": true  // Allow all.
+              }
             }
           },
           {
@@ -1659,43 +1953,43 @@ describe("DB operations", () => {
             timestamp, tx), {
           "func_results": {
             "_saveLastTx": {
-              "op_results": [
-                {
-                  "path": "/test/test_function_triggering/allowed_path/.last_tx/value",
+              "op_results": {
+                "0": {
+                  "path": "/apps/test/test_function_triggering/allowed_path/.last_tx/value",
                   "result": {
                     "func_results": {
                       "_eraseValue": {
-                        "op_results": [
-                          {
-                            "path": "/test/test_function_triggering/allowed_path/.last_tx/value",
+                        "op_results": {
+                          "0": {
+                            "path": "/apps/test/test_function_triggering/allowed_path/.last_tx/value",
                             "result": {
                               "code": 0,
-                              "gas_amount": 1,
+                              "bandwidth_gas_amount": 1,
                             }
                           }
-                        ],
+                        },
                         "code": "SUCCESS",
-                        "gas_amount": 0,
+                        "bandwidth_gas_amount": 0,
                       }
                     },
                     "code": 0,
-                    "gas_amount": 1
+                    "bandwidth_gas_amount": 1
                   }
                 }
-              ],
+              },
               "code": "SUCCESS",
-              "gas_amount": 0
+              "bandwidth_gas_amount": 0
             }
           },
           "code": 0,
-          "gas_amount": 1
+          "bandwidth_gas_amount": 1
         });
         assert.deepEqual(node.db.getValue(valuePath), value)
       })
 
       it("when failed with function triggering", () => {
-        const valuePath = '/test/test_function_triggering/allowed_path/value';
-        const functionResultPath = '/test/test_function_triggering/allowed_path/.last_tx/value';
+        const valuePath = '/apps/test/test_function_triggering/allowed_path/value';
+        const functionResultPath = '/apps/test/test_function_triggering/allowed_path/.last_tx/value';
         const value = 'some value';
         const timestamp = 1234567890000;
 
@@ -1716,14 +2010,18 @@ describe("DB operations", () => {
             type: 'SET_RULE',
             ref: valuePath,
             value: {
-              ".write": true,
+              ".rule": {
+                "write": true
+              }
             }
           },
           {
             type: 'SET_RULE',
             ref: functionResultPath,
             value: {
-              ".write": "auth.fid !== '_eraseValue'",  // Do NOT allow writes by the last function.
+              ".rule": {
+                "write": "auth.fid !== '_eraseValue'"  // Do NOT allow writes by the last function.
+              }
             }
           },
           {
@@ -1759,37 +2057,37 @@ describe("DB operations", () => {
             timestamp, tx), {
           "func_results": {
             "_saveLastTx": {
-              "op_results": [
-                {
-                  "path": "/test/test_function_triggering/allowed_path/.last_tx/value",
+              "op_results": {
+                "0": {
+                  "path": "/apps/test/test_function_triggering/allowed_path/.last_tx/value",
                   "result": {
                     "func_results": {
                       "_eraseValue": {
-                        "op_results": [
-                          {
-                            "path": "/test/test_function_triggering/allowed_path/.last_tx/value",
+                        "op_results": {
+                          "0": {
+                            "path": "/apps/test/test_function_triggering/allowed_path/.last_tx/value",
                             "result": {
                               "code": 103,
-                              "error_message": "No .write permission on: /test/test_function_triggering/allowed_path/.last_tx/value",
-                              "gas_amount": 0
+                              "error_message": "No write permission on: /apps/test/test_function_triggering/allowed_path/.last_tx/value",
+                              "bandwidth_gas_amount": 1
                             }
                           }
-                        ],
+                        },
                         "code": "FAILURE",
-                        "gas_amount": 0,
+                        "bandwidth_gas_amount": 0,
                       }
                     },
                     "code": 0,
-                    "gas_amount": 1
+                    "bandwidth_gas_amount": 1
                   }
                 }
-              ],
+              },
               "code": "FAILURE",
-              "gas_amount": 0,
+              "bandwidth_gas_amount": 0,
             }
           },
           "code": 0,
-          "gas_amount": 1,
+          "bandwidth_gas_amount": 1,
         });
         assert.deepEqual(node.db.getValue(valuePath), value)
       })
@@ -1800,24 +2098,24 @@ describe("DB operations", () => {
         assert.deepEqual(node.db.executeMultiSetOperation([
           {
             // Default type: SET_VALUE
-            ref: "test/nested/far/down",
+            ref: "/apps/test/nested/far/down",
             value: {
               "new": 12345
             }
           },
           {
             type: "INC_VALUE",
-            ref: "test/increment/value",
+            ref: "/apps/test/increment/value",
             value: 10
           },
           {
             type: "DEC_VALUE",
-            ref: "test/decrement/value",
+            ref: "/apps/test/decrement/value",
             value: 10
           },
           {
             type: "SET_FUNCTION",
-            ref: "/test/test_function/some/path",
+            ref: "/apps/test/test_function/some/path",
             value: {
               ".function": {
                 "fid": {
@@ -1831,14 +2129,16 @@ describe("DB operations", () => {
           },
           {
             type: "SET_RULE",
-            ref: "/test/test_rule/some/path",
+            ref: "/apps/test/test_rule/some/path",
             value: {
-              ".write": "other rule config"
+              ".rule": {
+                "write": "other rule config"
+              }
             }
           },
           {
             type: "SET_OWNER",
-            ref: "/test/test_owner/some/path",
+            ref: "/apps/test/test_owner/some/path",
             value: {
               ".owner": {
                 "owners": {
@@ -1865,37 +2165,37 @@ describe("DB operations", () => {
             }
           }
         ], { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' }, null, { extra: { executed_at: 1234567890000 }}), {
-          "result_list": [
-            {
+          "result_list": {
+            "0": {
               "code": 0,
-              "gas_amount": 1,
+              "bandwidth_gas_amount": 1,
             },
-            {
+            "1": {
               "code": 0,
-              "gas_amount": 1
+              "bandwidth_gas_amount": 1
             },
-            {
+            "2": {
               "code": 0,
-              "gas_amount": 1
+              "bandwidth_gas_amount": 1
             },
-            {
+            "3": {
               "code": 0,
-              "gas_amount": 1
+              "bandwidth_gas_amount": 1
             },
-            {
+            "4": {
               "code": 0,
-              "gas_amount": 1
+              "bandwidth_gas_amount": 1
             },
-            {
+            "5": {
               "code": 0,
-              "gas_amount": 1
+              "bandwidth_gas_amount": 1
             }
-          ]
+          }
         });
-        assert.deepEqual(node.db.getValue("test/nested/far/down"), { "new": 12345 })
-        expect(node.db.getValue("test/increment/value")).to.equal(30)
-        expect(node.db.getValue("test/decrement/value")).to.equal(10)
-        assert.deepEqual(node.db.getFunction("/test/test_function/some/path"), {
+        assert.deepEqual(node.db.getValue("/apps/test/nested/far/down"), { "new": 12345 })
+        expect(node.db.getValue("/apps/test/increment/value")).to.equal(30)
+        expect(node.db.getValue("/apps/test/decrement/value")).to.equal(10)
+        assert.deepEqual(node.db.getFunction("/apps/test/test_function/some/path"), {
           ".function": {
             "fid": {
               "event_listener": "https://events.ainetwork.ai/trigger2",  // modified
@@ -1917,10 +2217,13 @@ describe("DB operations", () => {
             }
           }
         });
+        assert.deepEqual(node.db.getRule("/apps/test/test_rule/some/path"), {
+          ".rule": {
+            "write": "other rule config"
+          }
+        });
         assert.deepEqual(
-            node.db.getRule("/test/test_rule/some/path"), { ".write": "other rule config" });
-        assert.deepEqual(
-            node.db.getOwner("/test/test_owner/some/path"), {
+            node.db.getOwner("/apps/test/test_owner/some/path"), {
               ".owner": {
                 "owners": {
                   "*": {
@@ -1950,40 +2253,40 @@ describe("DB operations", () => {
         assert.deepEqual(node.db.executeMultiSetOperation([
           {
             type: "SET_VALUE",
-            ref: "test/nested/far/down",
+            ref: "/apps/test/nested/far/down",
             value: {
               "new": 12345
             }
           },
           {
             type: "INC_VALUE",
-            ref: "test/ai/foo",
+            ref: "/apps/test/ai/foo",
             value: 10
           },
           {
             type: "DEC_VALUE",
-            ref: "test/decrement/value",
+            ref: "/apps/test/decrement/value",
             value: 10
           },
         ]), {
-          result_list: [
-            {
+          result_list: {
+            "0": {
               "code": 0,
-              "gas_amount": 1
+              "bandwidth_gas_amount": 1
             },
-            {
+            "1": {
               "code": 201,
               "error_message": "Not a number type: bar or 10",
-              "gas_amount": 0
+              "bandwidth_gas_amount": 1
             }
-          ]
+          }
         })
-        expect(node.db.getValue("test/ai/foo")).to.equal("bar")
+        expect(node.db.getValue("/apps/test/ai/foo")).to.equal("bar")
       })
 
       it("when successful with function triggering", () => {
-        const valuePath = '/test/test_function_triggering/allowed_path/value';
-        const functionResultPath = '/test/test_function_triggering/allowed_path/.last_tx/value';
+        const valuePath = '/apps/test/test_function_triggering/allowed_path/value';
+        const functionResultPath = '/apps/test/test_function_triggering/allowed_path/.last_tx/value';
         const value = 'some value';
         const timestamp = 1234567890000;
 
@@ -2004,14 +2307,18 @@ describe("DB operations", () => {
             type: 'SET_RULE',
             ref: valuePath,
             value: {
-              ".write": true,
+              ".rule": {
+                "write": true
+              }
             }
           },
           {
             type: 'SET_RULE',
             ref: functionResultPath,
             value: {
-              ".write": true,  // Allow all.
+              ".rule": {
+                "write": true  // Allow all.
+              }
             }
           },
           {
@@ -2040,7 +2347,7 @@ describe("DB operations", () => {
               },
               {
                 // Default type: SET_VALUE
-                ref: "test/nested/far/down",
+                ref: "/apps/test/nested/far/down",
                 value: {
                   "new": 12345
                 }
@@ -2057,52 +2364,52 @@ describe("DB operations", () => {
 
         assert.deepEqual(node.db.executeMultiSetOperation(txBody.operation.op_list,
             { addr: 'abcd' }, timestamp, tx), {
-          "result_list": [
-            {
+          "result_list": {
+            "0": {
               "func_results": {
                 "_saveLastTx": {
-                  "op_results": [
-                    {
-                      "path": "/test/test_function_triggering/allowed_path/.last_tx/value",
+                  "op_results": {
+                    "0": {
+                      "path": "/apps/test/test_function_triggering/allowed_path/.last_tx/value",
                       "result": {
                         "func_results": {
                           "_eraseValue": {
-                            "op_results": [
-                              {
-                                "path": "/test/test_function_triggering/allowed_path/.last_tx/value",
+                            "op_results": {
+                              "0": {
+                                "path": "/apps/test/test_function_triggering/allowed_path/.last_tx/value",
                                 "result": {
                                   "code": 0,
-                                  "gas_amount": 1
+                                  "bandwidth_gas_amount": 1
                                 }
                               }
-                            ],
+                            },
                             "code": "SUCCESS",
-                            "gas_amount": 0
+                            "bandwidth_gas_amount": 0
                           }
                         },
                         "code": 0,
-                        "gas_amount": 1
+                        "bandwidth_gas_amount": 1
                       }
                     }
-                  ],
+                  },
                   "code": "SUCCESS",
-                  "gas_amount": 0
+                  "bandwidth_gas_amount": 0
                 }
               },
               "code": 0,
-              "gas_amount": 1
+              "bandwidth_gas_amount": 1
             },
-            {
+            "1": {
               "code": 0,
-              "gas_amount": 1
+              "bandwidth_gas_amount": 1
             },
-          ],
+          },
         });
       })
 
       it("when failed with function triggering", () => {
-        const valuePath = '/test/test_function_triggering/allowed_path/value';
-        const functionResultPath = '/test/test_function_triggering/allowed_path/.last_tx/value';
+        const valuePath = '/apps/test/test_function_triggering/allowed_path/value';
+        const functionResultPath = '/apps/test/test_function_triggering/allowed_path/.last_tx/value';
         const value = 'some value';
         const timestamp = 1234567890000;
 
@@ -2123,14 +2430,18 @@ describe("DB operations", () => {
             type: 'SET_RULE',
             ref: valuePath,
             value: {
-              ".write": true,
+              ".rule": {
+                "write": true
+              }
             }
           },
           {
             type: 'SET_RULE',
             ref: functionResultPath,
             value: {
-              ".write": "auth.fid !== '_eraseValue'",  // Do NOT allow writes by the last function.
+              ".rule": {
+                "write": "auth.fid !== '_eraseValue'"  // Do NOT allow writes by the last function.
+              }
             }
           },
           {
@@ -2159,7 +2470,7 @@ describe("DB operations", () => {
               },
               {
                 // Default type: SET_VALUE
-                ref: "test/nested/far/down",
+                ref: "/apps/test/nested/far/down",
                 value: {
                   "new": 12345
                 }
@@ -2176,43 +2487,43 @@ describe("DB operations", () => {
 
         assert.deepEqual(node.db.executeMultiSetOperation(txBody.operation.op_list,
             { addr: 'abcd' }, timestamp, tx), {
-          "result_list": [
-            {
+          "result_list": {
+            "0": {
               "func_results": {
                 "_saveLastTx": {
-                  "op_results": [
-                    {
-                      "path": "/test/test_function_triggering/allowed_path/.last_tx/value",
+                  "op_results": {
+                    "0": {
+                      "path": "/apps/test/test_function_triggering/allowed_path/.last_tx/value",
                       "result": {
                         "func_results": {
                           "_eraseValue": {
-                            "op_results": [
-                              {
-                                "path": "/test/test_function_triggering/allowed_path/.last_tx/value",
+                            "op_results": {
+                              "0": {
+                                "path": "/apps/test/test_function_triggering/allowed_path/.last_tx/value",
                                 "result": {
                                   "code": 103,
-                                  "error_message": "No .write permission on: /test/test_function_triggering/allowed_path/.last_tx/value",
-                                  "gas_amount": 0,
+                                  "error_message": "No write permission on: /apps/test/test_function_triggering/allowed_path/.last_tx/value",
+                                  "bandwidth_gas_amount": 1,
                                 }
                               }
-                            ],
+                            },
                             "code": "FAILURE",
-                            "gas_amount": 0,
+                            "bandwidth_gas_amount": 0,
                           }
                         },
                         "code": 0,
-                        "gas_amount": 1
+                        "bandwidth_gas_amount": 1
                       }
                     }
-                  ],
+                  },
                   "code": "FAILURE",
-                  "gas_amount": 0,
+                  "bandwidth_gas_amount": 0,
                 }
               },
               "code": 0,
-              "gas_amount": 1
+              "bandwidth_gas_amount": 1
             },
-          ],
+          },
         });
       })
     })
@@ -2229,11 +2540,15 @@ describe("DB operations", () => {
 
       node = new BlockchainNode();
       setNodeForTesting(node);
+      node.db.writeDatabase(
+        [PredefinedDbPaths.VALUES_ROOT, PredefinedDbPaths.STAKING, 'test', PredefinedDbPaths.STAKING_BALANCE_TOTAL],
+        1
+      );
 
       txBody = {
         operation: {
           type: 'SET_VALUE',
-          ref: '/test/some/path/for/tx',
+          ref: '/apps/test/some/path/for/tx',
           value: 'some value',
         },
         gas_price: 1000000,
@@ -2252,24 +2567,35 @@ describe("DB operations", () => {
       it("returns code 0 for executable transaction", () => {
         expect(executableTx.extra).to.not.equal(undefined);
         expect(executableTx.extra.executed_at).to.equal(null);
-        assert.deepEqual(node.db.executeTransaction(executableTx, node.bc.lastBlockNumber() + 1), {
+        assert.deepEqual(node.db.executeTransaction(executableTx, false, true, node.bc.lastBlockNumber() + 1), {
           code: 0,
-          gas_amount: 1,
+          gas_amount_charged: 8,
+          bandwidth_gas_amount: 1,
           gas_amount_total: {
-            app: {},
-            service: 1
+            bandwidth: {
+              app: {
+                test: 1
+              },
+              service: 0
+            },
+            state: {
+              app: {
+                test: 846
+              },
+              service: 8
+            }
           },
-          gas_cost_total: 1,
+          gas_cost_total: 8
         });
         // extra.executed_at is updated with a non-null value.
         expect(executableTx.extra.executed_at).to.not.equal(null);
       });
 
       it("returns error code for object transaction", () => {
-        assert.deepEqual(node.db.executeTransaction(objectTx, node.bc.lastBlockNumber() + 1), {
+        assert.deepEqual(node.db.executeTransaction(objectTx, false, true, node.bc.lastBlockNumber() + 1), {
           code: 21,
-          error_message: "[executeTransaction] Not executable transaction: {\"tx_body\":{\"operation\":{\"type\":\"SET_VALUE\",\"ref\":\"/test/some/path/for/tx\",\"value\":\"some value\"},\"gas_price\":1000000,\"nonce\":-1,\"timestamp\":1568798344000},\"signature\":\"0xd0c7aee750ef0437ac8efe6c8c8b304d760f3271c36c4ea96d11f3446c9d772124a165aedc7bd6483dd4b318da7729867863f81714c250bf460ec39d0467624a26c47189b3e20eb5d2d698cf00bb11f729833b73282925b759df9e652f0a33dd1c\",\"hash\":\"0xd0c7aee750ef0437ac8efe6c8c8b304d760f3271c36c4ea96d11f3446c9d7721\",\"address\":\"0x00ADEc28B6a845a085e03591bE7550dd68673C1C\"}",
-          gas_amount: 0
+          error_message: "[precheckTransaction] Not executable transaction: {\"tx_body\":{\"operation\":{\"type\":\"SET_VALUE\",\"ref\":\"/apps/test/some/path/for/tx\",\"value\":\"some value\"},\"gas_price\":1000000,\"nonce\":-1,\"timestamp\":1568798344000},\"signature\":\"0x8b07b9ba72d969396c460faee6959b1b89b61fa049e116fd81686224fffd4fb19a879b401552e0c07bc211a7ba7cbb99e2ac32922e6f3c118caf183c2b351a7527ad5322e51d5f8405b2751255ca012008894a7e2e7673232fba1490a9fb35671b\",\"hash\":\"0x8b07b9ba72d969396c460faee6959b1b89b61fa049e116fd81686224fffd4fb1\",\"address\":\"0x00ADEc28B6a845a085e03591bE7550dd68673C1C\"}",
+          bandwidth_gas_amount: 0
         });
         assert.deepEqual(objectTx.extra, undefined);
       });
@@ -2278,7 +2604,7 @@ describe("DB operations", () => {
         const maxHeightTxBody = {
           operation: {
             type: 'SET_VALUE',
-            ref: '/test/3/4/5/6/7/8/9/10/11/12/13/14/15/16/17/18/19/20',
+            ref: '/apps/test/4/5/6/7/8/9/10/11/12/13/14/15/16/17/18/19/20',
             value: 'some value',
           },
           gas_price: 0,
@@ -2286,12 +2612,23 @@ describe("DB operations", () => {
           timestamp: 1568798344000,
         };
         const maxHeightTx = Transaction.fromTxBody(maxHeightTxBody, node.account.private_key);
-        assert.deepEqual(node.db.executeTransaction(maxHeightTx, node.bc.lastBlockNumber() + 1), {
+        assert.deepEqual(node.db.executeTransaction(maxHeightTx, false, true, node.bc.lastBlockNumber() + 1), {
           code: 0,
-          gas_amount: 1,
+          gas_amount_charged: 8,
+          bandwidth_gas_amount: 1,
           gas_amount_total: {
-            app: {},
-            service: 1
+            bandwidth: {
+              app: {
+                test: 1
+              },
+              service: 0
+            },
+            state: {
+              app: {
+                test: 2956
+              },
+              service: 8
+            }
           },
           gas_cost_total: 0,
         });
@@ -2299,7 +2636,7 @@ describe("DB operations", () => {
         const overHeightTxBody = {
           operation: {
             type: 'SET_VALUE',
-            ref: '/test/3/4/5/6/7/8/9/10/11/12/13/14/15/16/17/18/19/20/21',
+            ref: '/apps/test/4/5/6/7/8/9/10/11/12/13/14/15/16/17/18/19/20/21',
             value: 'some value',
           },
           gas_price: 0,
@@ -2307,25 +2644,96 @@ describe("DB operations", () => {
           timestamp: 1568798344000,
         };
         const overHeightTx = Transaction.fromTxBody(overHeightTxBody, node.account.private_key);
-        assert.deepEqual(node.db.executeTransaction(overHeightTx, node.bc.lastBlockNumber() + 1), {
+        assert.deepEqual(node.db.executeTransaction(overHeightTx, false, true, node.bc.lastBlockNumber() + 1), {
           code: 23,
           error_message: "Out of tree height limit (21 > 20)",
-          gas_amount: 0,
+          gas_amount_charged: 0,
+          bandwidth_gas_amount: 1,
+          gas_cost_total: 0,
+          gas_amount_total: {
+            bandwidth: {
+              app: {
+                test: 1
+              },
+              service: 0
+            },
+            state: {
+              service: 0
+            }
+          }
         });
-      })
+      });
+
+      it('cannot exceed service state budget', () => {
+        // Bloat the state tree just below the service state budget
+        const addr = ainUtil.createAccount().address;
+        const valueObj = {};
+        for (let i = 0; i < 6000; i++) {
+          valueObj[i] = {
+            value: 1,
+            result: {
+              timestamp: 1568798344000,
+              tx_hash: "0xb23fbdfb7b38dc4859872c565b1b0e4140ca4b7896397c817a290b2507e79708",
+              code: "SUCCESS"
+            }
+          }
+        }
+        const tempDb = node.createTempDb(node.db.stateVersion, 'CONSENSUS_UNIT_TEST', node.bc.lastBlockNumber());
+        tempDb.writeDatabase(
+          [PredefinedDbPaths.VALUES_ROOT, PredefinedDbPaths.ACCOUNTS, node.account.address, PredefinedDbPaths.BALANCE],
+          1000000000);
+        tempDb.writeDatabase(
+            [PredefinedDbPaths.VALUES_ROOT, PredefinedDbPaths.TRANSFER, node.account.address, addr],
+            valueObj);
+        node.cloneAndFinalizeVersion(tempDb.stateVersion, -1);
+        expect(node.db.getStateUsageAtPath('/')[StateInfoProperties.TREE_BYTES]).to.be.lessThan(SERVICE_STATE_BUDGET);
+        
+        const expectedGasAmountTotal = {
+          bandwidth: {
+            service: 4500,
+            app: {},
+          },
+          state: {
+            service: 3550560
+          } 
+        };
+        const overSizeTxBody = {
+          operation: {
+            type: 'SET',
+            op_list: []
+          },
+          gas_price: 1,
+          nonce: -1,
+          timestamp: 1568798344000,
+        };
+        for (let i = 0; i < 1500; i++) {
+          overSizeTxBody.operation.op_list.push({
+            type: 'SET_VALUE',
+            ref: `/manage_app/app_${i}/create/${i}`,
+            value: { admin: { [node.account.address]: true } }
+          });
+          expectedGasAmountTotal.bandwidth.app[`app_${i}`] = 2;
+        }
+        const overSizeTx = Transaction.fromTxBody(overSizeTxBody, node.account.private_key);
+        const res = node.db.executeTransaction(overSizeTx, false, true, node.bc.lastBlockNumber() + 1);
+        assert.deepEqual(res.code, 25);
+        assert.deepEqual(res.error_message, "Exceeded state budget limit for services (10791482 > 10000000)");
+        assert.deepEqual(res.gas_amount_total, expectedGasAmountTotal);
+        assert.deepEqual(res.gas_cost_total, 3.5550599999999997);
+      });
 
-      it("rejects over-size transaction", () => {
+      it("cannot exceed apps state budget", () => {
         const overSizeTree = {};
         for (let i = 0; i < 1000; i++) {
           overSizeTree[i] = {};
-          for (let j = 0; j < 1000; j++) {
+          for (let j = 0; j < 100; j++) {
             overSizeTree[i][j] = 'a';
           }
         }
         const overSizeTxBody = {
           operation: {
             type: 'SET_VALUE',
-            ref: '/test/tree',
+            ref: '/apps/test/tree',
             value: overSizeTree,
           },
           gas_price: 1,
@@ -2333,12 +2741,116 @@ describe("DB operations", () => {
           timestamp: 1568798344000,
         };
         const overSizeTx = Transaction.fromTxBody(overSizeTxBody, node.account.private_key);
-        assert.deepEqual(node.db.executeTransaction(overSizeTx, node.bc.lastBlockNumber() + 1), {
-          code: 24,
-          error_message: "Out of tree size limit (1001532 > 1000000)",
-          gas_amount: 0,
+        const res = node.db.executeTransaction(overSizeTx, false, true, node.bc.lastBlockNumber() + 1);
+        assert.deepEqual(res.code, 26);
+        assert.deepEqual(res.error_message, "Exceeded state budget limit for apps (16769332 > 9000000)");
+        assert.deepEqual(res.gas_amount_total, {
+          bandwidth: { service: 0, app: { test: 1 } },
+          state: { service: 8, app: { test: 16746108 } }
         });
-      })
+        assert.deepEqual(res.gas_cost_total, 0);
+      });
+
+      it('cannot exceed per-app state budget', () => {
+        // Set up 10 apps & stake 1 for each
+        let timestamp = 1568798344000;
+        for (let i = 0; i < 10; i++) {
+          const stakeTx = Transaction.fromTxBody({
+            operation: {
+              type: 'SET_VALUE',
+              ref: `/staking/app_${i}/${node.account.address}/0/stake/${i}/value`,
+              value: 1
+            },
+            gas_price: 1,
+            nonce: -1,
+            timestamp: timestamp++,
+          }, node.account.private_key);
+          const stakeRes = node.db.executeTransaction(stakeTx, false, true, node.bc.lastBlockNumber() + 1);
+          assert.deepEqual(stakeRes.code, 0);
+          const createAppTx = Transaction.fromTxBody({
+            operation: {
+              type: 'SET_VALUE',
+              ref: `/manage_app/app_${i}/create/${i}`,
+              value: { admin: { [node.account.address]: true } }
+            },
+            gas_price: 1,
+            nonce: -1,
+            timestamp: timestamp++,
+          }, node.account.private_key);
+          const createAppRes = node.db.executeTransaction(createAppTx, false, true, node.bc.lastBlockNumber() + 1);
+          assert.deepEqual(createAppRes.code, 0);
+        }
+        // Send 1/10 + 1 budget tx for one of them
+        const overSizeTree = {};
+        for (let i = 0; i < 1000; i++) {
+          overSizeTree[i] = {};
+          for (let j = 0; j < 5; j++) {
+            overSizeTree[i][j] = 'a';
+          }
+        }
+        const overSizeTxBody = {
+          operation: {
+            type: 'SET_VALUE',
+            ref: '/apps/app_0/tree',
+            value: overSizeTree,
+          },
+          gas_price: 1,
+          nonce: -1,
+          timestamp
+        };
+        const overSizeTx = Transaction.fromTxBody(overSizeTxBody, node.account.private_key);
+        const res = node.db.executeTransaction(overSizeTx, false, true, node.bc.lastBlockNumber() + 1);
+        assert.deepEqual(res.code, 31);
+        assert.deepEqual(res.error_message, "Exceeded state budget limit for app app_0 (988222 > 818181.8181818182)");
+        assert.deepEqual(res.gas_amount_total, {
+          bandwidth: { service: 0, app: { app_0: 1 } },
+          state: { service: 8, app: { app_0: 986108 } }
+        });
+        assert.deepEqual(res.gas_cost_total, 0);
+      });
+
+      it('cannot exceed 10% free tier for state budget', () => {
+        // Set up 1 app & do not stake
+        const createAppTx = Transaction.fromTxBody({
+          operation: {
+            type: 'SET_VALUE',
+            ref: `/manage_app/app_0/create/0`,
+            value: { admin: { [node.account.address]: true } }
+          },
+          gas_price: 1,
+          nonce: -1,
+          timestamp: 1568798344000
+        }, node.account.private_key);
+        const createAppRes = node.db.executeTransaction(createAppTx, false, true, node.bc.lastBlockNumber() + 1);
+        assert.deepEqual(createAppRes.code, 0);
+        // Send over 10% budget tx
+        const overSizeTree = {};
+        for (let i = 0; i < 1000; i++) {
+          overSizeTree[i] = {};
+          for (let j = 0; j < 10; j++) {
+            overSizeTree[i][j] = 'a';
+          }
+        }
+        const overSizeTxBody = {
+          operation: {
+            type: 'SET_VALUE',
+            ref: '/apps/app_0/tree',
+            value: overSizeTree,
+          },
+          gas_price: 1,
+          nonce: -1,
+          timestamp: 1568798344001
+        };
+        const overSizeTx = Transaction.fromTxBody(overSizeTxBody, node.account.private_key);
+        const res = node.db.executeTransaction(overSizeTx, false, true, node.bc.lastBlockNumber() + 1);
+        assert.deepEqual(res.code, 29);
+        assert.deepEqual(res.error_message, "Exceeded state budget limit for free tier (1808222 > 1000000)");
+        assert.deepEqual(res.gas_amount_total, {
+          bandwidth: { service: 0, app: { app_0: 1 } },
+          state: { service: 8, app: { app_0: 1806108 } }
+        });
+        assert.deepEqual(res.gas_cost_total, 0);
+      });
     });
   });
 
@@ -2358,26 +2870,30 @@ describe("DB operations", () => {
           "terminal_2": null,
         }
       };
-      const valueResult = node.db.setValue("/test/empty_values/node_0", emptyValues);
+      const valueResult = node.db.setValue("/apps/test/empty_values/node_0", emptyValues);
       assert.deepEqual(valueResult.code, 0);
 
       emptyRules = {
         "node_1a": {
           "node_2a": {
             "node_3a": {
-              ".write": "some rule a"
+              ".rule": {
+                "write": "some rule a"
+              }
             }
           }
         },
         "node_1b": {
           "node_2b": {
             "node_3b": {
-              ".write": "some rule b"
+              ".rule": {
+                "write": "some rule b"
+              }
             }
           }
         }
       };
-      const ruleResult = node.db.setRule("/test/empty_rules/node_0", emptyRules);
+      const ruleResult = node.db.setRule("/apps/test/empty_rules/node_0", emptyRules);
       assert.deepEqual(ruleResult.code, 0);
 
       emptyOwners = {
@@ -2414,25 +2930,25 @@ describe("DB operations", () => {
           }
         }
       };
-      const ownerResult = node.db.setOwner("/test/empty_owners/node_0", emptyOwners);
+      const ownerResult = node.db.setOwner("/apps/test/empty_owners/node_0", emptyOwners);
       assert.deepEqual(ownerResult.code, 0);
     });
 
     afterEach(() => {
-      const valueResult = node.db.setValue("/test/empty_values/node_0", null);
+      const valueResult = node.db.setValue("/apps/test/empty_values/node_0", null);
       assert.deepEqual(valueResult.code, 0);
 
-      const ruleResult = node.db.setRule("/test/empty_rules/node_0", null);
+      const ruleResult = node.db.setRule("/apps/test/empty_rules/node_0", null);
       assert.deepEqual(ruleResult.code, 0);
 
-      const ownerResult = node.db.setRule("/test/empty_owners/node_0", null);
+      const ownerResult = node.db.setRule("/apps/test/empty_owners/node_0", null);
       assert.deepEqual(ownerResult.code, 0);
     });
 
     it("when setValue() with non-empty value", () => {
       expect(node.db.setValue(
-          "/test/empty_values/node_0/node_1a/node_2/node_3", "another value").code).to.equal(0);
-      assert.deepEqual(node.db.getValue("/test/empty_values/node_0"), {
+          "/apps/test/empty_values/node_0/node_1a/node_2/node_3", "another value").code).to.equal(0);
+      assert.deepEqual(node.db.getValue("/apps/test/empty_values/node_0"), {
         "terminal_1a": null,
         "terminal_1b": null,
         "terminal_1c": "",
@@ -2450,8 +2966,8 @@ describe("DB operations", () => {
 
     it("when setValue() with 'null' value", () => {
       expect(node.db.setValue(
-          "/test/empty_values/node_0/node_1a/node_2/node_3", null).code).to.equal(0);
-      assert.deepEqual(node.db.getValue("/test/empty_values/node_0"), {
+          "/apps/test/empty_values/node_0/node_1a/node_2/node_3", null).code).to.equal(0);
+      assert.deepEqual(node.db.getValue("/apps/test/empty_values/node_0"), {
         "terminal_1c": "",
         "node_1b": {
           "terminal_2": null,
@@ -2460,22 +2976,27 @@ describe("DB operations", () => {
     })
 
     it("when setRule() with non-empty rule", () => {
-      expect(node.db.setRule(
-          "/test/empty_rules/node_0/node_1a/node_2a/node_3a", {
-            ".write": "some other rule"
-          }).code).to.equal(0)
-      assert.deepEqual(node.db.getRule("/test/empty_rules/node_0"), {
+      expect(node.db.setRule("/apps/test/empty_rules/node_0/node_1a/node_2a/node_3a", {
+        ".rule": {
+          "write": "some other rule"
+        }
+      }).code).to.equal(0)
+      assert.deepEqual(node.db.getRule("/apps/test/empty_rules/node_0"), {
         "node_1a": {
           "node_2a": {
             "node_3a": {
-              ".write": "some other rule"
+              ".rule": {
+                "write": "some other rule"
+              }
             }
           }
         },
         "node_1b": {
           "node_2b": {
             "node_3b": {
-              ".write": "some rule b"
+              ".rule": {
+                "write": "some rule b"
+              }
             }
           }
         }
@@ -2484,12 +3005,14 @@ describe("DB operations", () => {
 
     it("when setRule() with 'null' rule", () => {
       expect(node.db.setRule(
-          "/test/empty_rules/node_0/node_1a/node_2a/node_3a", null).code).to.equal(0);
-      assert.deepEqual(node.db.getRule("/test/empty_rules/node_0"), {
+          "/apps/test/empty_rules/node_0/node_1a/node_2a/node_3a", null).code).to.equal(0);
+      assert.deepEqual(node.db.getRule("/apps/test/empty_rules/node_0"), {
         "node_1b": {
           "node_2b": {
             "node_3b": {
-              ".write": "some rule b"
+              ".rule": {
+                "write": "some rule b"
+              }
             }
           }
         }
@@ -2498,7 +3021,7 @@ describe("DB operations", () => {
 
     it("when setOwner() with non-empty owner", () => {
       expect(node.db.setOwner(
-          "/test/empty_owners/node_0/node_1a/node_2a/node_3a", {
+          "/apps/test/empty_owners/node_0/node_1a/node_2a/node_3a", {
             ".owner": {
               "owners": {
                 "*": {
@@ -2510,7 +3033,7 @@ describe("DB operations", () => {
               }
             }
           }).code).to.equal(0)
-      assert.deepEqual(node.db.getOwner("/test/empty_owners/node_0"), {
+      assert.deepEqual(node.db.getOwner("/apps/test/empty_owners/node_0"), {
         "node_1a": {
           "node_2a": {
             "node_3a": {
@@ -2548,8 +3071,8 @@ describe("DB operations", () => {
 
     it("when setOwner() with 'null' owner", () => {
       expect(node.db.setOwner(
-          "/test/empty_owners/node_0/node_1a/node_2a/node_3a", null).code).to.equal(0);
-      assert.deepEqual(node.db.getOwner("/test/empty_owners/node_0"), {
+          "/apps/test/empty_owners/node_0/node_1a/node_2a/node_3a", null).code).to.equal(0);
+      assert.deepEqual(node.db.getOwner("/apps/test/empty_owners/node_0"), {
         "node_1b": {
           "node_2b": {
             "node_3b": {
@@ -2612,9 +3135,9 @@ describe("DB rule config", () => {
     dbValues["second_users"][node2.account.address][node2.account.address] = "i can write";
     dbValues["second_users"][node1.account.address]["something_else"] = "i can write";
 
-    result = node1.db.setValue("test", dbValues);
+    result = node1.db.setValue("/apps/test", dbValues);
     assert.deepEqual(result.code, 0);
-    result = node2.db.setValue("test", dbValues);
+    result = node2.db.setValue("/apps/test", dbValues);
     assert.deepEqual(result.code, 0);
   })
 
@@ -2623,34 +3146,34 @@ describe("DB rule config", () => {
   });
 
   it("only allows certain users to write certain info if balance is greater than 0", () => {
-    expect(node2.db.evalRule(`test/users/${node2.account.address}/balance`, 0, null, null))
+    expect(node2.db.evalRule(`/apps/test/users/${node2.account.address}/balance`, 0, null, null))
         .to.equal(true)
-    expect(node2.db.evalRule(`test/users/${node2.account.address}/balance`, -1, null, null))
+    expect(node2.db.evalRule(`/apps/test/users/${node2.account.address}/balance`, -1, null, null))
         .to.equal(false)
-    expect(node1.db.evalRule(`test/users/${node1.account.address}/balance`, 1, null, null))
+    expect(node1.db.evalRule(`/apps/test/users/${node1.account.address}/balance`, 1, null, null))
         .to.equal(true)
   })
 
   it("only allows certain users to write certain info if data exists", () => {
-    expect(node1.db.evalRule(`test/users/${node1.account.address}/info`, "something", null, null))
+    expect(node1.db.evalRule(`/apps/test/users/${node1.account.address}/info`, "something", null, null))
         .to.equal(true)
     expect(node2.db.evalRule(
-        `test/users/${node2.account.address}/info`, "something else", null, null))
+        `/apps/test/users/${node2.account.address}/info`, "something else", null, null))
             .to.equal(false)
     expect(node2.db.evalRule(
-        `test/users/${node2.account.address}/new_info`, "something",
+        `/apps/test/users/${node2.account.address}/new_info`, "something",
         { addr: node2.account.address }, null))
             .to.equal(true)
   })
 
   it("apply the closest ancestor's rule config if not exists", () => {
     expect(node1.db.evalRule(
-        `test/users/${node1.account.address}/child/grandson`, "something",
+        `/apps/test/users/${node1.account.address}/child/grandson`, "something",
         { addr: node1.account.address },
         null))
             .to.equal(true)
     expect(node2.db.evalRule(
-        `test/users/${node2.account.address}/child/grandson`, "something",
+        `/apps/test/users/${node2.account.address}/child/grandson`, "something",
         { addr: node1.account.address },
         null))
             .to.equal(false)
@@ -2658,34 +3181,34 @@ describe("DB rule config", () => {
 
   it("only allows certain users to write certain info if data at other locations exists", () => {
     expect(node2.db.evalRule(
-        `test/users/${node2.account.address}/balance_info`, "something", null, null))
+        `/apps/test/users/${node2.account.address}/balance_info`, "something", null, null))
             .to.equal(true)
     expect(node1.db.evalRule(
-        `test/users/${node1.account.address}/balance_info`, "something", null, null))
+        `/apps/test/users/${node1.account.address}/balance_info`, "something", null, null))
             .to.equal(false)
   })
 
   it("validates old data and new data together", () => {
-    expect(node1.db.evalRule(`test/users/${node1.account.address}/next_counter`, 11, null,  null))
+    expect(node1.db.evalRule(`/apps/test/users/${node1.account.address}/next_counter`, 11, null,  null))
         .to.equal(true)
-    expect(node1.db.evalRule(`test/users/${node1.account.address}/next_counter`, 12, null, null))
+    expect(node1.db.evalRule(`/apps/test/users/${node1.account.address}/next_counter`, 12, null, null))
         .to.equal(false)
   })
 
   it("can handle nested path variables", () => {
     expect(node2.db.evalRule(
-        `test/second_users/${node2.account.address}/${node2.account.address}`, "some value", null,
+        `/apps/test/second_users/${node2.account.address}/${node2.account.address}`, "some value", null,
         null))
             .to.equal(true)
     expect(node1.db.evalRule(
-        `test/second_users/${node1.account.address}/next_counter`, "some other value", null, null))
+        `/apps/test/second_users/${node1.account.address}/next_counter`, "some other value", null, null))
             .to.equal(false)
   })
 
   it("duplicated path variables", () => {
-    expect(node1.db.evalRule('test/no_dup_key/aaa/bbb', "some value", null, null))
+    expect(node1.db.evalRule('/apps/test/no_dup_key/aaa/bbb', "some value", null, null))
         .to.equal(true)
-    expect(node1.db.evalRule('test/dup_key/aaa/bbb', "some value", null, null))
+    expect(node1.db.evalRule('/apps/test/dup_key/aaa/bbb', "some value", null, null))
         .to.equal(true)
   })
 })
@@ -2698,7 +3221,7 @@ describe("DB owner config", () => {
 
     node = new BlockchainNode();
     setNodeForTesting(node);
-    assert.deepEqual(node.db.setOwner("test/test_owner/mixed/true/true/true",
+    assert.deepEqual(node.db.setOwner("/apps/test/test_owner/mixed/true/true/true",
       {
         ".owner": {
           "owners": {
@@ -2724,7 +3247,7 @@ describe("DB owner config", () => {
         }
       }
     ).code, 0);
-    assert.deepEqual(node.db.setOwner("test/test_owner/mixed/false/true/true",
+    assert.deepEqual(node.db.setOwner("/apps/test/test_owner/mixed/false/true/true",
       {
         ".owner": {
           "owners": {
@@ -2750,7 +3273,7 @@ describe("DB owner config", () => {
         }
       }
     ).code, 0);
-    assert.deepEqual(node.db.setOwner("test/test_owner/mixed/true/false/true",
+    assert.deepEqual(node.db.setOwner("/apps/test/test_owner/mixed/true/false/true",
       {
         ".owner": {
           "owners": {
@@ -2776,7 +3299,7 @@ describe("DB owner config", () => {
         }
       }
     ).code, 0);
-    assert.deepEqual(node.db.setOwner("test/test_owner/mixed/true/true/false",
+    assert.deepEqual(node.db.setOwner("/apps/test/test_owner/mixed/true/true/false",
       {
         ".owner": {
           "owners": {
@@ -2811,114 +3334,114 @@ describe("DB owner config", () => {
   // Known user
   it("branch_owner permission for known user with mixed config", () => {
     expect(node.db.evalOwner(
-        '/test/test_owner/mixed/true/true/true/branch', 'branch_owner',
+        '/apps/test/test_owner/mixed/true/true/true/branch', 'branch_owner',
         { addr: '0x08Aed7AF9354435c38d52143EE50ac839D20696b' }))
             .to.equal(true)
     expect(node.db.evalOwner(
-        '/test/test_owner/mixed/false/true/true/branch', 'branch_owner',
+        '/apps/test/test_owner/mixed/false/true/true/branch', 'branch_owner',
         { addr: '0x08Aed7AF9354435c38d52143EE50ac839D20696b' }))
             .to.equal(false)
     expect(node.db.evalOwner(
-        '/test/test_owner/mixed/true/false/true/branch', 'branch_owner',
+        '/apps/test/test_owner/mixed/true/false/true/branch', 'branch_owner',
         { addr: '0x08Aed7AF9354435c38d52143EE50ac839D20696b' }))
             .to.equal(true)
     expect(node.db.evalOwner(
-        '/test/test_owner/mixed/true/true/false/branch', 'branch_owner',
+        '/apps/test/test_owner/mixed/true/true/false/branch', 'branch_owner',
         { addr: '0x08Aed7AF9354435c38d52143EE50ac839D20696b' }))
             .to.equal(true)
   })
 
   it("write_owner permission for known user with mixed config", () => {
     expect(node.db.evalOwner(
-        '/test/test_owner/mixed/true/true/true', 'write_owner',
+        '/apps/test/test_owner/mixed/true/true/true', 'write_owner',
         { addr: '0x08Aed7AF9354435c38d52143EE50ac839D20696b' }))
             .to.equal(true)
     expect(node.db.evalOwner(
-        '/test/test_owner/mixed/false/true/true', 'write_owner',
+        '/apps/test/test_owner/mixed/false/true/true', 'write_owner',
         { addr: '0x08Aed7AF9354435c38d52143EE50ac839D20696b' }))
             .to.equal(true)
     expect(node.db.evalOwner(
-        '/test/test_owner/mixed/true/false/true', 'write_owner',
+        '/apps/test/test_owner/mixed/true/false/true', 'write_owner',
         { addr: '0x08Aed7AF9354435c38d52143EE50ac839D20696b' }))
             .to.equal(false)
     expect(node.db.evalOwner(
-        '/test/test_owner/mixed/true/true/false', 'write_owner',
+        '/apps/test/test_owner/mixed/true/true/false', 'write_owner',
         { addr: '0x08Aed7AF9354435c38d52143EE50ac839D20696b' }))
             .to.equal(true)
   })
 
   it("write_rule permission for known user with mixed config", () => {
     expect(node.db.evalOwner(
-        '/test/test_owner/mixed/true/true/true', 'write_rule',
+        '/apps/test/test_owner/mixed/true/true/true', 'write_rule',
         { addr: '0x08Aed7AF9354435c38d52143EE50ac839D20696b' }))
             .to.equal(true)
     expect(node.db.evalOwner(
-        '/test/test_owner/mixed/false/true/true', 'write_rule',
+        '/apps/test/test_owner/mixed/false/true/true', 'write_rule',
         { addr: '0x08Aed7AF9354435c38d52143EE50ac839D20696b' }))
             .to.equal(true)
     expect(node.db.evalOwner(
-        '/test/test_owner/mixed/true/false/true', 'write_rule',
+        '/apps/test/test_owner/mixed/true/false/true', 'write_rule',
         { addr: '0x08Aed7AF9354435c38d52143EE50ac839D20696b' }))
             .to.equal(true)
     expect(node.db.evalOwner(
-        '/test/test_owner/mixed/true/true/false', 'write_rule',
+        '/apps/test/test_owner/mixed/true/true/false', 'write_rule',
         { addr: '0x08Aed7AF9354435c38d52143EE50ac839D20696b' }))
             .to.equal(false)
   })
 
   it("write_rule permission on deeper path for known user with mixed config", () => {
     expect(node.db.evalOwner(
-        '/test/test_owner/mixed/true/true/true/deeper_path', 'write_rule',
+        '/apps/test/test_owner/mixed/true/true/true/deeper_path', 'write_rule',
         { addr: '0x08Aed7AF9354435c38d52143EE50ac839D20696b' }))
             .to.equal(true)
     expect(node.db.evalOwner(
-        '/test/test_owner/mixed/false/true/true/deeper_path', 'write_rule',
+        '/apps/test/test_owner/mixed/false/true/true/deeper_path', 'write_rule',
         { addr: '0x08Aed7AF9354435c38d52143EE50ac839D20696b' }))
             .to.equal(true)
     expect(node.db.evalOwner(
-        '/test/test_owner/mixed/true/false/true/deeper_path', 'write_rule',
+        '/apps/test/test_owner/mixed/true/false/true/deeper_path', 'write_rule',
         { addr: '0x08Aed7AF9354435c38d52143EE50ac839D20696b' }))
             .to.equal(true)
     expect(node.db.evalOwner(
-        '/test/test_owner/mixed/true/true/false/deeper_path', 'write_rule',
+        '/apps/test/test_owner/mixed/true/true/false/deeper_path', 'write_rule',
         { addr: '0x08Aed7AF9354435c38d52143EE50ac839D20696b' }))
             .to.equal(false)
   })
 
   it("write_function permission for known user with mixed config", () => {
     expect(node.db.evalOwner(
-        '/test/test_owner/mixed/true/true/true', 'write_function',
+        '/apps/test/test_owner/mixed/true/true/true', 'write_function',
         { addr: '0x08Aed7AF9354435c38d52143EE50ac839D20696b' }))
             .to.equal(true)
     expect(node.db.evalOwner(
-        '/test/test_owner/mixed/false/true/true', 'write_function',
+        '/apps/test/test_owner/mixed/false/true/true', 'write_function',
         { addr: '0x08Aed7AF9354435c38d52143EE50ac839D20696b' }))
             .to.equal(true)
     expect(node.db.evalOwner(
-        '/test/test_owner/mixed/true/false/true', 'write_function',
+        '/apps/test/test_owner/mixed/true/false/true', 'write_function',
         { addr: '0x08Aed7AF9354435c38d52143EE50ac839D20696b' }))
             .to.equal(true)
     expect(node.db.evalOwner(
-        '/test/test_owner/mixed/true/true/false', 'write_function',
+        '/apps/test/test_owner/mixed/true/true/false', 'write_function',
         { addr: '0x08Aed7AF9354435c38d52143EE50ac839D20696b' }))
             .to.equal(false)
   })
 
   it("write_function permission on deeper path for known user with mixed config", () => {
     expect(node.db.evalOwner(
-        '/test/test_owner/mixed/true/true/true/deeper_path', 'write_function',
+        '/apps/test/test_owner/mixed/true/true/true/deeper_path', 'write_function',
         { addr: '0x08Aed7AF9354435c38d52143EE50ac839D20696b' }))
             .to.equal(true)
     expect(node.db.evalOwner(
-        '/test/test_owner/mixed/false/true/true/deeper_path', 'write_function',
+        '/apps/test/test_owner/mixed/false/true/true/deeper_path', 'write_function',
         { addr: '0x08Aed7AF9354435c38d52143EE50ac839D20696b' }))
             .to.equal(true)
     expect(node.db.evalOwner(
-        '/test/test_owner/mixed/true/false/true/deeper_path', 'write_function',
+        '/apps/test/test_owner/mixed/true/false/true/deeper_path', 'write_function',
         { addr: '0x08Aed7AF9354435c38d52143EE50ac839D20696b' }))
             .to.equal(true)
     expect(node.db.evalOwner(
-        '/test/test_owner/mixed/true/true/false/deeper_path', 'write_function',
+        '/apps/test/test_owner/mixed/true/true/false/deeper_path', 'write_function',
         { addr: '0x08Aed7AF9354435c38d52143EE50ac839D20696b' }))
             .to.equal(false)
   })
@@ -2926,94 +3449,94 @@ describe("DB owner config", () => {
   // Unknown user
   it("branch_owner permission for unknown user with mixed config", () => {
     expect(node.db.evalOwner(
-        '/test/test_owner/mixed/true/true/true/branch', 'branch_owner',
+        '/apps/test/test_owner/mixed/true/true/true/branch', 'branch_owner',
         { addr: '0x07A43138CC760C85A5B1F115aa60eADEaa0bf417' }))
             .to.equal(false)
     expect(node.db.evalOwner(
-        '/test/test_owner/mixed/false/true/true/branch', 'branch_owner',
+        '/apps/test/test_owner/mixed/false/true/true/branch', 'branch_owner',
         { addr: '0x07A43138CC760C85A5B1F115aa60eADEaa0bf417' }))
             .to.equal(true)
     expect(node.db.evalOwner(
-        '/test/test_owner/mixed/true/false/true/branch', 'branch_owner',
+        '/apps/test/test_owner/mixed/true/false/true/branch', 'branch_owner',
         { addr: '0x07A43138CC760C85A5B1F115aa60eADEaa0bf417' }))
             .to.equal(false)
     expect(node.db.evalOwner(
-        '/test/test_owner/mixed/true/true/false/branch', 'branch_owner',
+        '/apps/test/test_owner/mixed/true/true/false/branch', 'branch_owner',
         { addr: '0x07A43138CC760C85A5B1F115aa60eADEaa0bf417' }))
             .to.equal(false)
   })
 
   it("write_owner permission for unknown user with mixed config", () => {
-    expect(node.db.evalOwner('/test/test_owner/mixed/true/true/true', 'write_owner',
+    expect(node.db.evalOwner('/apps/test/test_owner/mixed/true/true/true', 'write_owner',
         { addr: '0x07A43138CC760C85A5B1F115aa60eADEaa0bf417' }))
             .to.equal(false)
-    expect(node.db.evalOwner('/test/test_owner/mixed/false/true/true', 'write_owner',
+    expect(node.db.evalOwner('/apps/test/test_owner/mixed/false/true/true', 'write_owner',
         { addr: '0x07A43138CC760C85A5B1F115aa60eADEaa0bf417' }))
             .to.equal(false)
-    expect(node.db.evalOwner('/test/test_owner/mixed/true/false/true', 'write_owner',
+    expect(node.db.evalOwner('/apps/test/test_owner/mixed/true/false/true', 'write_owner',
         { addr: '0x07A43138CC760C85A5B1F115aa60eADEaa0bf417' }))
             .to.equal(true)
-    expect(node.db.evalOwner('/test/test_owner/mixed/true/true/false', 'write_owner',
+    expect(node.db.evalOwner('/apps/test/test_owner/mixed/true/true/false', 'write_owner',
         { addr: '0x07A43138CC760C85A5B1F115aa60eADEaa0bf417' }))
             .to.equal(false)
   })
 
   it("write_rule permission for unknown user with mixed config", () => {
-    expect(node.db.evalOwner('/test/test_owner/mixed/true/true/true', 'write_rule',
+    expect(node.db.evalOwner('/apps/test/test_owner/mixed/true/true/true', 'write_rule',
         { addr: '0x07A43138CC760C85A5B1F115aa60eADEaa0bf417' }))
             .to.equal(false)
-    expect(node.db.evalOwner('/test/test_owner/mixed/false/true/true', 'write_rule',
+    expect(node.db.evalOwner('/apps/test/test_owner/mixed/false/true/true', 'write_rule',
         { addr: '0x07A43138CC760C85A5B1F115aa60eADEaa0bf417' }))
             .to.equal(false)
-    expect(node.db.evalOwner('/test/test_owner/mixed/true/false/true', 'write_rule',
+    expect(node.db.evalOwner('/apps/test/test_owner/mixed/true/false/true', 'write_rule',
         { addr: '0x07A43138CC760C85A5B1F115aa60eADEaa0bf417' }))
             .to.equal(false)
-    expect(node.db.evalOwner('/test/test_owner/mixed/true/true/false', 'write_rule',
+    expect(node.db.evalOwner('/apps/test/test_owner/mixed/true/true/false', 'write_rule',
         { addr: '0x07A43138CC760C85A5B1F115aa60eADEaa0bf417' }))
             .to.equal(true)
   })
 
   it("write_rule permission on deeper path for unknown user with mixed config", () => {
-    expect(node.db.evalOwner('/test/test_owner/mixed/true/true/true/deeper_path', 'write_rule',
+    expect(node.db.evalOwner('/apps/test/test_owner/mixed/true/true/true/deeper_path', 'write_rule',
         { addr: '0x07A43138CC760C85A5B1F115aa60eADEaa0bf417' }))
             .to.equal(false)
-    expect(node.db.evalOwner('/test/test_owner/mixed/false/true/true/deeper_path', 'write_rule',
+    expect(node.db.evalOwner('/apps/test/test_owner/mixed/false/true/true/deeper_path', 'write_rule',
         { addr: '0x07A43138CC760C85A5B1F115aa60eADEaa0bf417' }))
             .to.equal(false)
-    expect(node.db.evalOwner('/test/test_owner/mixed/true/false/true/deeper_path', 'write_rule',
+    expect(node.db.evalOwner('/apps/test/test_owner/mixed/true/false/true/deeper_path', 'write_rule',
         { addr: '0x07A43138CC760C85A5B1F115aa60eADEaa0bf417' }))
             .to.equal(false)
-    expect(node.db.evalOwner('/test/test_owner/mixed/true/true/false/deeper_path', 'write_rule',
+    expect(node.db.evalOwner('/apps/test/test_owner/mixed/true/true/false/deeper_path', 'write_rule',
         { addr: '0x07A43138CC760C85A5B1F115aa60eADEaa0bf417' }))
             .to.equal(true)
   })
 
   it("write_function permission for unknown user with mixed config", () => {
-    expect(node.db.evalOwner('/test/test_owner/mixed/true/true/true', 'write_function',
+    expect(node.db.evalOwner('/apps/test/test_owner/mixed/true/true/true', 'write_function',
         { addr: '0x07A43138CC760C85A5B1F115aa60eADEaa0bf417' })).to.equal(false)
-    expect(node.db.evalOwner('/test/test_owner/mixed/false/true/true', 'write_function',
+    expect(node.db.evalOwner('/apps/test/test_owner/mixed/false/true/true', 'write_function',
         { addr: '0x07A43138CC760C85A5B1F115aa60eADEaa0bf417' })).to.equal(false)
-    expect(node.db.evalOwner('/test/test_owner/mixed/true/false/true', 'write_function',
+    expect(node.db.evalOwner('/apps/test/test_owner/mixed/true/false/true', 'write_function',
         { addr: '0x07A43138CC760C85A5B1F115aa60eADEaa0bf417' })).to.equal(false)
-    expect(node.db.evalOwner('/test/test_owner/mixed/true/true/false', 'write_function',
+    expect(node.db.evalOwner('/apps/test/test_owner/mixed/true/true/false', 'write_function',
         { addr: '0x07A43138CC760C85A5B1F115aa60eADEaa0bf417' })).to.equal(true)
   })
 
   it("write_function permission on deeper path for unknown user with mixed config", () => {
     expect(node.db.evalOwner(
-        '/test/test_owner/mixed/true/true/true/deeper_path', 'write_function',
+        '/apps/test/test_owner/mixed/true/true/true/deeper_path', 'write_function',
         { addr: '0x07A43138CC760C85A5B1F115aa60eADEaa0bf417' }))
             .to.equal(false)
     expect(node.db.evalOwner(
-        '/test/test_owner/mixed/false/true/true/deeper_path', 'write_function',
+        '/apps/test/test_owner/mixed/false/true/true/deeper_path', 'write_function',
         { addr: '0x07A43138CC760C85A5B1F115aa60eADEaa0bf417' }))
             .to.equal(false)
     expect(node.db.evalOwner(
-        '/test/test_owner/mixed/true/false/true/deeper_path', 'write_function',
+        '/apps/test/test_owner/mixed/true/false/true/deeper_path', 'write_function',
          { addr: '0x07A43138CC760C85A5B1F115aa60eADEaa0bf417' }))
             .to.equal(false)
     expect(node.db.evalOwner(
-        '/test/test_owner/mixed/true/true/false/deeper_path', 'write_function',
+        '/apps/test/test_owner/mixed/true/true/false/deeper_path', 'write_function',
         { addr: '0x07A43138CC760C85A5B1F115aa60eADEaa0bf417' }))
             .to.equal(true)
   })
@@ -3055,7 +3578,7 @@ describe("DB sharding config", () => {
         }
       }
     };
-    result = node.db.setValue("test/test_sharding", dbValues);
+    result = node.db.setValue("/apps/test/test_sharding", dbValues);
     assert.deepEqual(result.code, 0);
 
     dbFuncs = {
@@ -3084,23 +3607,29 @@ describe("DB sharding config", () => {
         }
       }
     };
-    result = node.db.setFunction("test/test_sharding", dbFuncs);
+    result = node.db.setFunction("/apps/test/test_sharding", dbFuncs);
     assert.deepEqual(result.code, 0);
 
     dbRules = {
       "some": {
         "path": {
-          ".write": "false",
+          ".rule": {
+            "write": "false"
+          },
           "to": {
-            ".write": "auth.addr === '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1'",
+            ".rule": {
+              "write": "auth.addr === '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1'"
+            },
             "deeper": {
-              ".write": "some deeper rule config",
+              ".rule": {
+                "write": "some deeper rule config"
+              }
             }
           }
         }
       }
     };
-    result = node.db.setRule("test/test_sharding", dbRules);
+    result = node.db.setRule("/apps/test/test_sharding", dbRules);
     assert.deepEqual(result.code, 0);
 
     dbOwners = {
@@ -3139,7 +3668,7 @@ describe("DB sharding config", () => {
         }
       }
     };
-    result = node.db.setOwner("test/test_sharding", dbOwners);
+    result = node.db.setOwner("/apps/test/test_sharding", dbOwners);
     assert.deepEqual(result.code, 0);
   })
 
@@ -3169,182 +3698,182 @@ describe("DB sharding config", () => {
     const decDelta = 3;
 
     it("getValue with isGlobal = false", () => {
-      expect(node.db.getValue("test/test_sharding/some/path/to/value")).to.equal(value);
-      expect(node.db.getValue("apps/test_sharding/afan/test/some/path/to/value")).to.equal(null);
+      expect(node.db.getValue("/apps/test/test_sharding/some/path/to/value")).to.equal(value);
+      expect(node.db.getValue("/apps/test_sharding/afan/test/some/path/to/value")).to.equal(null);
     })
 
     it("getValue with isGlobal = true", () => {
-      expect(node.db.getValue("test/test_sharding/some/path/to/value", false, true)).to.equal(null);
-      expect(node.db.getValue("apps/afan/test/test_sharding/some/path/to/value", false, true))
+      expect(node.db.getValue("/apps/test/apps/test/test_sharding/some/path/to/value", { isShallow: false, isGlobal: true })).to.equal(null);
+      expect(node.db.getValue("/apps/afan/apps/test/test_sharding/some/path/to/value", { isShallow: false, isGlobal: true }))
           .to.equal(value);
     })
 
     it("getValue with isGlobal = true and non-existing path", () => {
-      expect(node.db.getValue("some/non-existing/path", false, true)).to.equal(null);
+      expect(node.db.getValue("/apps/some/non-existing/path", { isShallow: false, isGlobal: true })).to.equal(null);
     })
 
     it("setValue with isGlobal = false", () => {
       expect(node.db.setValue(
-          "test/test_sharding/some/path/to/value", newValue, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' },
+          "/apps/test/test_sharding/some/path/to/value", newValue, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' },
           null, { extra: { executed_at: 1234567890000 }}).code)
               .to.equal(0);
-      expect(node.db.getValue("test/test_sharding/some/path/to/value")).to.equal(newValue);
+      expect(node.db.getValue("/apps/test/test_sharding/some/path/to/value")).to.equal(newValue);
     })
 
     it("setValue with isGlobal = true", () => {
       expect(node.db.setValue(
-          "apps/afan/test/test_sharding/some/path/to/value", newValue, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' },
-          null, { extra: { executed_at: 1234567890000 }}, true).code)
+          "/apps/afan/apps/test/test_sharding/some/path/to/value", newValue, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' },
+          null, { extra: { executed_at: 1234567890000 }}, { isGlobal: true }).code)
               .to.equal(0);
-      expect(node.db.getValue("test/test_sharding/some/path/to/value")).to.equal(newValue);
+      expect(node.db.getValue("/apps/test/test_sharding/some/path/to/value")).to.equal(newValue);
     })
 
     it("setValue with isGlobal = true and non-existing path", () => {
       expect(node.db.setValue(
-          "some/non-existing/path", newValue, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' },
-          null, { extra: { executed_at: 1234567890000 }}, true).code)
+          "/apps/some/non-existing/path", newValue, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' },
+          null, { extra: { executed_at: 1234567890000 }}, { isGlobal: true }).code)
               .to.equal(0);
     })
 
     it("setValue with isGlobal = false and non-writable path with sharding", () => {
-      assert.deepEqual(node.db.setValue("test/test_sharding/shards/enabled_shard/path", 20), {
+      assert.deepEqual(node.db.setValue("/apps/test/test_sharding/shards/enabled_shard/path", 20), {
         "code": 104,
-        "error_message": "Non-writable path with shard config: /values/test/test_sharding/shards/enabled_shard",
-        "gas_amount": 0
+        "error_message": "Non-writable path with shard config: /values/apps/test/test_sharding/shards/enabled_shard",
+        "bandwidth_gas_amount": 1
       });
     })
 
     it("setValue with isGlobal = true and non-writable path with sharding", () => {
       expect(node.db.setValue(
-          "apps/afan/test/test_sharding/shards/enabled_shard/path", 20, '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1', null, null,
-          true).code)
+          "/apps/afan/apps/test/test_sharding/shards/enabled_shard/path", 20, '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1', null, null,
+          { isGlobal: true }).code)
               .to.equal(0);
-      expect(node.db.getValue("apps/afan/test/test_sharding/shards/enabled_shard/path", false, true))
+      expect(node.db.getValue("/apps/afan/apps/test/test_sharding/shards/enabled_shard/path", { isShallow: false, isGlobal: true }))
           .to.equal(10);  // value unchanged
     })
 
     it("setValue with isGlobal = false and writable path with sharding", () => {
-      expect(node.db.setValue("test/test_sharding/shards/disabled_shard/path", 20).code)
+      expect(node.db.setValue("/apps/test/test_sharding/shards/disabled_shard/path", 20).code)
           .to.equal(0);
-      expect(node.db.getValue("test/test_sharding/shards/disabled_shard/path")).to.equal(20);
+      expect(node.db.getValue("/apps/test/test_sharding/shards/disabled_shard/path")).to.equal(20);
     })
 
     it("setValue with isGlobal = true and writable path with sharding", () => {
       expect(node.db.setValue(
-          "apps/afan/test/test_sharding/shards/disabled_shard/path", 20, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' },
-          null, { extra: { executed_at: 1234567890000 }}, true).code)
+          "apps/afan/apps/test/test_sharding/shards/disabled_shard/path", 20, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' },
+          null, { extra: { executed_at: 1234567890000 }}, { isGlobal: true }).code)
               .to.equal(0);
-      expect(node.db.getValue("apps/afan/test/test_sharding/shards/disabled_shard/path", false, true))
+      expect(node.db.getValue("apps/afan/apps/test/test_sharding/shards/disabled_shard/path", { isShallow: false, isGlobal: true }))
           .to.equal(20);  // value changed
     })
 
     it("incValue with isGlobal = false", () => {
       expect(node.db.incValue(
-          "test/test_sharding/some/path/to/number", incDelta, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' },
+          "/apps/test/test_sharding/some/path/to/number", incDelta, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' },
           null, { extra: { executed_at: 1234567890000 }}).code)
               .to.equal(0);
-      expect(node.db.getValue("test/test_sharding/some/path/to/number")).to.equal(10 + incDelta);
+      expect(node.db.getValue("/apps/test/test_sharding/some/path/to/number")).to.equal(10 + incDelta);
     })
 
     it("incValue with isGlobal = true", () => {
       expect(node.db.incValue(
-          "apps/afan/test/test_sharding/some/path/to/number", incDelta, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' },
-          null, { extra: { executed_at: 1234567890000 }}, true).code)
+          "/apps/afan/apps/test/test_sharding/some/path/to/number", incDelta, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' },
+          null, { extra: { executed_at: 1234567890000 }}, { isGlobal: true }).code)
               .to.equal(0);
-      expect(node.db.getValue("test/test_sharding/some/path/to/number")).to.equal(10 + incDelta);
+      expect(node.db.getValue("/apps/test/test_sharding/some/path/to/number")).to.equal(10 + incDelta);
     })
 
     it("incValue with isGlobal = true and non-existing path", () => {
       expect(node.db.incValue(
-          "some/non-existing/path", incDelta, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' }, null, null, true).code)
+          "/apps/some/non-existing/path", incDelta, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' }, null, null, { isGlobal: true }).code)
               .to.equal(0);
     })
 
     it("setValue with isGlobal = false and non-writable path with sharding", () => {
-      assert.deepEqual(node.db.incValue("test/test_sharding/shards/enabled_shard/path", 5), {
+      assert.deepEqual(node.db.incValue("/apps/test/test_sharding/shards/enabled_shard/path", 5), {
         "code": 104,
-        "error_message": "Non-writable path with shard config: /values/test/test_sharding/shards/enabled_shard",
-        "gas_amount": 0
+        "error_message": "Non-writable path with shard config: /values/apps/test/test_sharding/shards/enabled_shard",
+        "bandwidth_gas_amount": 1
       });
     })
 
     it("setValue with isGlobal = true and non-writable path with sharding", () => {
       expect(node.db.incValue(
-          "apps/afan/test/test_sharding/shards/enabled_shard/path", 5, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' },
-          null, null, true).code)
+          "/apps/afan/apps/test/test_sharding/shards/enabled_shard/path", 5, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' },
+          null, null, { isGlobal: true }).code)
               .to.equal(0);
-      expect(node.db.getValue("apps/afan/test/test_sharding/shards/enabled_shard/path", false, true))
+      expect(node.db.getValue("apps/afan/apps/test/test_sharding/shards/enabled_shard/path", { isShallow: false, isGlobal: true }))
           .to.equal(10);  // value unchanged
     })
 
     it("setValue with isGlobal = false and writable path with sharding", () => {
-      expect(node.db.incValue("test/test_sharding/shards/disabled_shard/path", 5).code).to.equal(0);
-      expect(node.db.getValue("test/test_sharding/shards/disabled_shard/path"))
+      expect(node.db.incValue("/apps/test/test_sharding/shards/disabled_shard/path", 5).code).to.equal(0);
+      expect(node.db.getValue("/apps/test/test_sharding/shards/disabled_shard/path"))
           .to.equal(15);  // value changed
     })
 
     it("setValue with isGlobal = true and writable path with sharding", () => {
       expect(node.db.incValue(
-          "apps/afan/test/test_sharding/shards/disabled_shard/path", 5, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' },
-          null, { extra: { executed_at: 1234567890000 }}, true).code)
+          "/apps/afan/apps/test/test_sharding/shards/disabled_shard/path", 5, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' },
+          null, { extra: { executed_at: 1234567890000 }}, { isGlobal: true }).code)
               .to.equal(0);
-      expect(node.db.getValue("apps/afan/test/test_sharding/shards/disabled_shard/path", false, true))
+      expect(node.db.getValue("/apps/afan/apps/test/test_sharding/shards/disabled_shard/path", { isShallow: false, isGlobal: true }))
           .to.equal(15);  // value changed
     })
 
     it("decValue with isGlobal = false", () => {
       expect(node.db.decValue(
-          "test/test_sharding/some/path/to/number", decDelta, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' },
+          "/apps/test/test_sharding/some/path/to/number", decDelta, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' },
           null, { extra: { executed_at: 1234567890000 }}).code)
               .to.equal(0);
-      expect(node.db.getValue("test/test_sharding/some/path/to/number")).to.equal(10 - decDelta);
+      expect(node.db.getValue("/apps/test/test_sharding/some/path/to/number")).to.equal(10 - decDelta);
     })
 
     it("decValue with isGlobal = true", () => {
       expect(node.db.decValue(
-          "apps/afan/test/test_sharding/some/path/to/number", decDelta, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' },
-          null, { extra: { executed_at: 1234567890000 }}, true).code)
+          "/apps/afan/apps/test/test_sharding/some/path/to/number", decDelta, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' },
+          null, { extra: { executed_at: 1234567890000 }}, { isGlobal: true }).code)
               .to.equal(0);
-      expect(node.db.getValue("test/test_sharding/some/path/to/number")).to.equal(10 - decDelta);
+      expect(node.db.getValue("/apps/test/test_sharding/some/path/to/number")).to.equal(10 - decDelta);
     })
 
     it("decValue with isGlobal = true and non-existing path", () => {
       expect(node.db.decValue(
-          "some/non-existing/path", decDelta, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' }, null, null, true).code)
+          "/apps/some/non-existing/path", decDelta, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' }, null, null, { isGlobal: true }).code)
               .to.equal(0);
     })
 
     it("setValue with isGlobal = false and non-writable path with sharding", () => {
-      assert.deepEqual(node.db.decValue("test/test_sharding/shards/enabled_shard/path", 5), {
+      assert.deepEqual(node.db.decValue("/apps/test/test_sharding/shards/enabled_shard/path", 5), {
         "code": 104,
-        "error_message": "Non-writable path with shard config: /values/test/test_sharding/shards/enabled_shard",
-        "gas_amount": 0
+        "error_message": "Non-writable path with shard config: /values/apps/test/test_sharding/shards/enabled_shard",
+        "bandwidth_gas_amount": 1
       });
     })
 
     it("setValue with isGlobal = true and non-writable path with sharding", () => {
       expect(node.db.decValue(
-          "apps/afan/test/test_sharding/shards/enabled_shard/path", 5, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' },
-          null, null, true).code)
+          "/apps/afan/apps/test/test_sharding/shards/enabled_shard/path", 5, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' },
+          null, null, { isGlobal: true }).code)
               .to.equal(0);
       expect(node.db.getValue(
-          "apps/afan/test/test_sharding/shards/enabled_shard/path", false, true))
+          "/apps/afan/apps/test/test_sharding/shards/enabled_shard/path", { isShallow: false, isGlobal: true }))
               .to.equal(10);  // value unchanged
     })
 
     it("setValue with isGlobal = false and writable path with sharding", () => {
-      expect(node.db.decValue("test/test_sharding/shards/disabled_shard/path", 5).code)
+      expect(node.db.decValue("/apps/test/test_sharding/shards/disabled_shard/path", 5).code)
           .to.equal(0);
-      expect(node.db.getValue("test/test_sharding/shards/disabled_shard/path"))
+      expect(node.db.getValue("/apps/test/test_sharding/shards/disabled_shard/path"))
           .to.equal(5);  // value changed
     })
 
     it("setValue with isGlobal = true and writable path with sharding", () => {
       expect(node.db.decValue(
-          "apps/afan/test/test_sharding/shards/disabled_shard/path", 5, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' },
-          null, { extra: { executed_at: 1234567890000 }}, true).code)
+          "/apps/afan/apps/test/test_sharding/shards/disabled_shard/path", 5, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' },
+          null, { extra: { executed_at: 1234567890000 }}, { isGlobal: true }).code)
               .to.equal(0);
-      expect(node.db.getValue("apps/afan/test/test_sharding/shards/disabled_shard/path", false, true))
+      expect(node.db.getValue("/apps/afan/apps/test/test_sharding/shards/disabled_shard/path", { isShallow: false, isGlobal: true }))
         .to.equal(5);  // value changed
     })
 
@@ -3403,47 +3932,47 @@ describe("DB sharding config", () => {
     };
 
     it("getFunction with isGlobal = false", () => {
-      assert.deepEqual(node.db.getFunction("test/test_sharding/some/path/to"), func);
+      assert.deepEqual(node.db.getFunction("/apps/test/test_sharding/some/path/to"), func);
       expect(node.db.getFunction("apps/afan/test/test_sharding/some/path/to")).to.equal(null);
     })
 
     it("getFunction with isGlobal = true", () => {
-      expect(node.db.getFunction("test/test_sharding/some/path/to", false, true)).to.equal(null);
+      expect(node.db.getFunction("/apps/test/test_sharding/some/path/to", { isShallow: false, isGlobal: true })).to.equal(null);
       assert.deepEqual(
-          node.db.getFunction("apps/afan/test/test_sharding/some/path/to", false, true), func);
+          node.db.getFunction("/apps/afan/apps/test/test_sharding/some/path/to", { isShallow: false, isGlobal: true }), func);
     })
 
     it("getFunction with isGlobal = true and non-existing path", () => {
-      expect(node.db.getFunction("some/non-existing/path", false, true)).to.equal(null);
+      expect(node.db.getFunction("/apps/some/non-existing/path", { isShallow: false, isGlobal: true })).to.equal(null);
     })
 
     it("setFunction with isGlobal = false", () => {
       expect(node.db.setFunction(
-          "test/test_sharding/some/path/to", funcChange, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' }).code)
+          "/apps/test/test_sharding/some/path/to", funcChange, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' }).code)
               .to.equal(0);
-      assert.deepEqual(node.db.getFunction("test/test_sharding/some/path/to"), newFunc);
+      assert.deepEqual(node.db.getFunction("/apps/test/test_sharding/some/path/to"), newFunc);
     })
 
     it("setFunction with isGlobal = true", () => {
       expect(node.db.setFunction(
-          "apps/afan/test/test_sharding/some/path/to", funcChange, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' },
-          true).code)
+          "/apps/afan/apps/test/test_sharding/some/path/to", funcChange, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' },
+          { isGlobal: true }).code)
               .to.equal(0);
       assert.deepEqual(
-          node.db.getFunction("apps/afan/test/test_sharding/some/path/to", false, true), newFunc);
+          node.db.getFunction("/apps/afan/apps/test/test_sharding/some/path/to", { isShallow: false, isGlobal: true }), newFunc);
     })
 
     it("setFunction with isGlobal = true and non-existing path", () => {
       expect(node.db.setFunction(
-          "some/non-existing/path", funcChange, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' }, true).code)
+          "/apps/some/non-existing/path", funcChange, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' }, { isGlobal: true }).code)
               .to.equal(0);
     })
 
     it("matchFunction with isGlobal = false", () => {
-      assert.deepEqual(node.db.matchFunction("/test/test_sharding/some/path/to"), {
+      assert.deepEqual(node.db.matchFunction("/apps/test/test_sharding/some/path/to"), {
         "matched_path": {
-          "target_path": "/test/test_sharding/some/path/to",
-          "ref_path": "/test/test_sharding/some/path/to",
+          "target_path": "/apps/test/test_sharding/some/path/to",
+          "ref_path": "/apps/test/test_sharding/some/path/to",
           "path_vars": {},
         },
         "matched_config": {
@@ -3455,7 +3984,7 @@ describe("DB sharding config", () => {
               "service_name": "https://ainetwork.ai",
             }
           },
-          "path": "/test/test_sharding/some/path/to"
+          "path": "/apps/test/test_sharding/some/path/to"
         },
         "subtree_configs": [
           {
@@ -3474,10 +4003,10 @@ describe("DB sharding config", () => {
     })
 
     it("matchFunction with isGlobal = true", () => {
-      assert.deepEqual(node.db.matchFunction("/apps/afan/test/test_sharding/some/path/to", true), {
+      assert.deepEqual(node.db.matchFunction("/apps/afan/apps/test/test_sharding/some/path/to", { isGlobal: true }), {
         "matched_path": {
-          "target_path": "/apps/afan/test/test_sharding/some/path/to",
-          "ref_path": "/apps/afan/test/test_sharding/some/path/to",
+          "target_path": "/apps/afan/apps/test/test_sharding/some/path/to",
+          "ref_path": "/apps/afan/apps/test/test_sharding/some/path/to",
           "path_vars": {},
         },
         "matched_config": {
@@ -3489,7 +4018,7 @@ describe("DB sharding config", () => {
               "service_name": "https://ainetwork.ai",
             }
           },
-          "path": "/apps/afan/test/test_sharding/some/path/to"
+          "path": "/apps/afan/apps/test/test_sharding/some/path/to"
         },
         "subtree_configs": [
           {
@@ -3508,69 +4037,81 @@ describe("DB sharding config", () => {
     })
 
     it("matchFunction with isGlobal = true and non-existing path", () => {
-      expect(node.db.matchFunction("some/non-existing/path", true)).to.equal(null);
+      expect(node.db.matchFunction("/apps/some/non-existing/path", { isGlobal: true })).to.equal(null);
     })
   })
 
   describe("Rule operations", () => {
     const rule = {
-      ".write": "auth.addr === '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1'",
+      ".rule": {
+        "write": "auth.addr === '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1'"
+      },
       "deeper": {
-        ".write": "some deeper rule config"
+        ".rule": {
+          "write": "some deeper rule config"
+        }
+      }
+    };
+    const newRule = {
+      ".rule": {
+        "write": "another rule"
       }
     };
-    const newRule = { ".write": "another rule" };
     const newValue = "that";
 
     it("getRule with isGlobal = false", () => {
-      assert.deepEqual(node.db.getRule("test/test_sharding/some/path/to"), rule);
-      expect(node.db.getRule("apps/afan/test/test_sharding/some/path/to")).to.equal(null);
+      assert.deepEqual(node.db.getRule("/apps/test/test_sharding/some/path/to"), rule);
+      expect(node.db.getRule("/apps/afan/apps/test/test_sharding/some/path/to")).to.equal(null);
     })
 
     it("getRule with isGlobal = true", () => {
-      expect(node.db.getRule("test/test_sharding/some/path/to", false, true)).to.equal(null);
+      expect(node.db.getRule("/apps/test/test_sharding/some/path/to", { isShallow: false, isGlobal: true })).to.equal(null);
       assert.deepEqual(
-          node.db.getRule("apps/afan/test/test_sharding/some/path/to", false, true), rule);
+          node.db.getRule("/apps/afan/apps/test/test_sharding/some/path/to", { isShallow: false, isGlobal: true }), rule);
     })
 
     it("getRule with isGlobal = true and non-existing path", () => {
-      expect(node.db.getRule("some/non-existing/path", false, true)).to.equal(null);
+      expect(node.db.getRule("/apps/some/non-existing/path", { isShallow: false, isGlobal: true })).to.equal(null);
     })
 
     it("setRule with isGlobal = false", () => {
       expect(node.db.setRule(
-          "test/test_sharding/some/path/to", newRule, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' }).code)
+          "/apps/test/test_sharding/some/path/to", newRule, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' }).code)
               .to.equal(0);
-      assert.deepEqual(node.db.getRule("test/test_sharding/some/path/to"), newRule);
+      assert.deepEqual(node.db.getRule("/apps/test/test_sharding/some/path/to"), newRule);
     })
 
     it("setRule with isGlobal = true", () => {
       expect(node.db.setRule(
-          "apps/afan/test/test_sharding/some/path/to", newRule, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' }, true).code)
+          "/apps/afan/apps/test/test_sharding/some/path/to", newRule, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' }, { isGlobal: true }).code)
               .to.equal(0);
       assert.deepEqual(
-          node.db.getRule("apps/afan/test/test_sharding/some/path/to", false, true), newRule);
+          node.db.getRule("/apps/afan/apps/test/test_sharding/some/path/to", { isShallow: false, isGlobal: true }), newRule);
     })
 
     it("setRule with isGlobal = true and non-existing path", () => {
-      expect(node.db.setRule("some/non-existing/path", newRule, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' }, true).code)
+      expect(node.db.setRule("/apps/some/non-existing/path", newRule, { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' }, { isGlobal: true }).code)
           .to.equal(0);
     })
 
     it("matchRule with isGlobal = false", () => {
-      assert.deepEqual(node.db.matchRule("/test/test_sharding/some/path/to"), {
+      assert.deepEqual(node.db.matchRule("/apps/test/test_sharding/some/path/to"), {
         "matched_path": {
-          "target_path": "/test/test_sharding/some/path/to",
-          "ref_path": "/test/test_sharding/some/path/to",
+          "target_path": "/apps/test/test_sharding/some/path/to",
+          "ref_path": "/apps/test/test_sharding/some/path/to",
           "path_vars": {},
         },
         "matched_config": {
-          "config": "auth.addr === '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1'",
-          "path": "/test/test_sharding/some/path/to"
+          "config": {
+            "write": "auth.addr === '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1'"
+          },
+          "path": "/apps/test/test_sharding/some/path/to"
         },
         "subtree_configs": [
           {
-            "config": "some deeper rule config",
+            "config": {
+              "write": "some deeper rule config"
+            },
             "path": "/deeper",
           }
         ]
@@ -3578,19 +4119,23 @@ describe("DB sharding config", () => {
     })
 
     it("matchRule with isGlobal = true", () => {
-      assert.deepEqual(node.db.matchRule("/apps/afan/test/test_sharding/some/path/to", true), {
+      assert.deepEqual(node.db.matchRule("/apps/afan/apps/test/test_sharding/some/path/to", { isGlobal: true }), {
         "matched_path": {
-          "target_path": "/apps/afan/test/test_sharding/some/path/to",
-          "ref_path": "/apps/afan/test/test_sharding/some/path/to",
+          "target_path": "/apps/afan/apps/test/test_sharding/some/path/to",
+          "ref_path": "/apps/afan/apps/test/test_sharding/some/path/to",
           "path_vars": {},
         },
         "matched_config": {
-          "config": "auth.addr === '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1'",
-          "path": "/apps/afan/test/test_sharding/some/path/to"
+          "config": {
+            "write": "auth.addr === '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1'"
+          },
+          "path": "/apps/afan/apps/test/test_sharding/some/path/to"
         },
         "subtree_configs": [
           {
-            "config": "some deeper rule config",
+            "config": {
+              "write": "some deeper rule config"
+            },
             "path": "/deeper",
           }
         ]
@@ -3598,24 +4143,24 @@ describe("DB sharding config", () => {
     })
 
     it("matchRule with isGlobal = true and non-existing path", () => {
-      expect(node.db.matchRule("some/non-existing/path", true)).to.equal(null);
+      expect(node.db.matchRule("/apps/some/non-existing/path", { isGlobal: true })).to.equal(null);
     })
 
     it("evalRule with isGlobal = false", () => {
-      expect(node.db.evalRule("/test/test_sharding/some/path/to", newValue, { addr: "0x09A0d53FDf1c36A131938eb379b98910e55EEfe1" }))
+      expect(node.db.evalRule("/apps/test/test_sharding/some/path/to", newValue, { addr: "0x09A0d53FDf1c36A131938eb379b98910e55EEfe1" }))
           .to.equal(true);
     })
 
     it("evalRule with isGlobal = true", () => {
       expect(node.db.evalRule(
-          "/apps/afan/test/test_sharding/some/path/to", newValue, { addr: "0x09A0d53FDf1c36A131938eb379b98910e55EEfe1" },
-          null, true))
+          "/apps/afan/apps/test/test_sharding/some/path/to", newValue, { addr: "0x09A0d53FDf1c36A131938eb379b98910e55EEfe1" },
+          null, { isGlobal: true }))
               .to.equal(true);
     })
 
     it("evalRule with isGlobal = true and non-existing path", () => {
       expect(node.db.evalRule(
-          "/some/non-existing/path", newValue, { addr: "0x09A0d53FDf1c36A131938eb379b98910e55EEfe1" }, null, true))
+          "/apps/some/non-existing/path", newValue, { addr: "0x09A0d53FDf1c36A131938eb379b98910e55EEfe1" }, null, { isGlobal: true }))
               .to.equal(null);
     })
   })
@@ -3684,47 +4229,47 @@ describe("DB sharding config", () => {
     };
 
     it("getOwner with isGlobal = false", () => {
-      assert.deepEqual(node.db.getOwner("test/test_sharding/some/path/to"), owner);
-      expect(node.db.getOwner("apps/afan/test/test_sharding/some/path/to")).to.equal(null);
+      assert.deepEqual(node.db.getOwner("/apps/test/test_sharding/some/path/to"), owner);
+      expect(node.db.getOwner("/apps/afan/apps/test/test_sharding/some/path/to")).to.equal(null);
     })
 
     it("getOwner with isGlobal = true", () => {
-      expect(node.db.getOwner("test/test_sharding/some/path/to", false, true)).to.equal(null);
+      expect(node.db.getOwner("/apps/test/test_sharding/some/path/to", { isShallow: false, isGlobal: true })).to.equal(null);
       assert.deepEqual(
-          node.db.getOwner("apps/afan/test/test_sharding/some/path/to", false, true), owner);
+          node.db.getOwner("apps/afan/apps/test/test_sharding/some/path/to", { isShallow: false, isGlobal: true }), owner);
     })
 
     it("getOwner with isGlobal = true and non-existing path", () => {
-      expect(node.db.getOwner("some/non-existing/path", false, true)).to.equal(null);
+      expect(node.db.getOwner("/apps/some/non-existing/path", { isShallow: false, isGlobal: true })).to.equal(null);
     })
 
     it("setOwner with isGlobal = false", () => {
       expect(node.db.setOwner(
-          "test/test_sharding/some/path/to", ownerChange,
+          "/apps/test/test_sharding/some/path/to", ownerChange,
           { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' }).code)
               .to.equal(0);
-      assert.deepEqual(node.db.getOwner("test/test_sharding/some/path/to"), newOwner);
+      assert.deepEqual(node.db.getOwner("/apps/test/test_sharding/some/path/to"), newOwner);
     })
 
     it("setOwner with isGlobal = true", () => {
       expect(node.db.setOwner(
-          "apps/afan/test/test_sharding/some/path/to", ownerChange,
-          { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' }, true).code)
+          "/apps/afan/apps/test/test_sharding/some/path/to", ownerChange,
+          { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' }, { isGlobal: true }).code)
               .to.equal(0);
       assert.deepEqual(
-          node.db.getOwner("apps/afan/test/test_sharding/some/path/to", false, true), newOwner);
+          node.db.getOwner("/apps/afan/apps/test/test_sharding/some/path/to", { isShallow: false, isGlobal: true }), newOwner);
     })
 
     it("setOwner with isGlobal = true and non-existing path", () => {
       expect(node.db.setOwner(
-          "some/non-existing/path", ownerChange,
-          { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' }, true).code).to.equal(0);
+          "/apps/some/non-existing/path", ownerChange,
+          { addr: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1' }, { isGlobal: true }).code).to.equal(0);
     })
 
     it("matchOwner with isGlobal = false", () => {
-      assert.deepEqual(node.db.matchOwner("/test/test_sharding/some/path/to"), {
+      assert.deepEqual(node.db.matchOwner("/apps/test/test_sharding/some/path/to"), {
         "matched_path": {
-          "target_path": "/test/test_sharding/some/path/to",
+          "target_path": "/apps/test/test_sharding/some/path/to",
         },
         "matched_config": {
           "config": {
@@ -3743,15 +4288,15 @@ describe("DB sharding config", () => {
               }
             }
           },
-          "path": "/test/test_sharding/some/path/to"
+          "path": "/apps/test/test_sharding/some/path/to"
         }
       });
     })
 
     it("matchOwner with isGlobal = true", () => {
-      assert.deepEqual(node.db.matchOwner("/apps/afan/test/test_sharding/some/path/to", true), {
+      assert.deepEqual(node.db.matchOwner("/apps/afan/apps/test/test_sharding/some/path/to", { isGlobal: true }), {
         "matched_path": {
-          "target_path": "/apps/afan/test/test_sharding/some/path/to",
+          "target_path": "/apps/afan/apps/test/test_sharding/some/path/to",
         },
         "matched_config": {
           "config": {
@@ -3770,31 +4315,31 @@ describe("DB sharding config", () => {
               }
             }
           },
-          "path": "/apps/afan/test/test_sharding/some/path/to"
+          "path": "/apps/afan/apps/test/test_sharding/some/path/to"
         }
       });
     })
 
     it("matchOwner with isGlobal = true and non-existing path", () => {
-      expect(node.db.matchOwner("some/non-existing/path", true)).to.equal(null);
+      expect(node.db.matchOwner("/apps/some/non-existing/path", { isGlobal: true })).to.equal(null);
     })
 
     it("evalOwner with isGlobal = false", () => {
       expect(node.db.evalOwner(
-          "/test/test_sharding/some/path/to", "write_rule",
+          "/apps/test/test_sharding/some/path/to", "write_rule",
           { addr: "0x09A0d53FDf1c36A131938eb379b98910e55EEfe1" })).to.equal(true);
     })
 
     it("evalOwner with isGlobal = true", () => {
       expect(node.db.evalOwner(
-          "/apps/afan/test/test_sharding/some/path/to", "write_rule",
-          { addr: "0x09A0d53FDf1c36A131938eb379b98910e55EEfe1" }, true)).to.equal(true);
+          "/apps/afan/apps/test/test_sharding/some/path/to", "write_rule",
+          { addr: "0x09A0d53FDf1c36A131938eb379b98910e55EEfe1" }, { isGlobal: true })).to.equal(true);
     })
 
     it("evalOwner with isGlobal = true and non-existing path", () => {
       expect(node.db.evalOwner(
-          "/some/non-existing/path", "write_rule",
-          { addr: "0x09A0d53FDf1c36A131938eb379b98910e55EEfe1" }, true)).to.equal(null);
+          "/apps/some/non-existing/path", "write_rule",
+          { addr: "0x09A0d53FDf1c36A131938eb379b98910e55EEfe1" }, { isGlobal: true })).to.equal(null);
     })
   })
 })
@@ -3829,7 +4374,7 @@ describe("Proof hash", () => {
         child3: false
       }
     };
-    result = node.db.setValue("test", valuesObject);
+    result = node.db.setValue("/apps/test", valuesObject);
     assert.deepEqual(result.code, 0);
   });
 
@@ -3839,10 +4384,10 @@ describe("Proof hash", () => {
 
   describe("Check proof for setValue(), setOwner(), setRule(), and setFunction()", () => {
     it("checks proof hash of under $root_path/test", () => {
-      const valuesNode = node.db.getRefForReading(['values', 'test']);
-      const ownersNode = node.db.getRefForReading(['owners', 'test']);
-      const rulesNode = node.db.getRefForReading(['rules', 'test']);
-      const functionNode = node.db.getRefForReading(['functions', 'test']);
+      const valuesNode = node.db.getRefForReading(['values', 'apps', 'test']);
+      const ownersNode = node.db.getRefForReading(['owners', 'apps', 'test']);
+      const rulesNode = node.db.getRefForReading(['rules', 'apps', 'test']);
+      const functionNode = node.db.getRefForReading(['functions', 'apps', 'test']);
       expect(valuesNode.getProofHash()).to.equal(valuesNode.buildProofHash());
       expect(ownersNode.getProofHash()).to.equal(ownersNode.buildProofHash());
       expect(rulesNode.getProofHash()).to.equal(rulesNode.buildProofHash());
@@ -3853,13 +4398,19 @@ describe("Proof hash", () => {
       const nestedRules = {
         "nested": {
           "$var_path": {
-            ".write": "auth.addr !== 'abcd'"
+            ".rule": {
+              "write": "auth.addr !== 'abcd'"
+            }
           },
           "path": {
-            ".write": "auth.addr === 'abcd'",
+            ".rule": {
+              "write": "auth.addr === 'abcd'"
+            },
             "deeper": {
               "path": {
-                ".write": "auth.addr === 'ijkl'"
+                ".rule": {
+                  "write": "auth.addr === 'ijkl'"
+                }
               }
             }
           }
@@ -3887,14 +4438,14 @@ describe("Proof hash", () => {
           },
         }
       };
-      node.db.setValue("test/level0/level1/level2", { aaa: 'bbb' });
-      node.db.setOwner("test/empty_owners/.owner/owners/*/write_function", false);
-      node.db.setRule("test/test_rules", nestedRules);
-      node.db.setFunction("test/test_functions", dbFuncs);
-      const valuesNode = node.db.getRefForReading(['values', 'test']);
-      const ownersNode = node.db.getRefForReading(['owners', 'test']);
-      const rulesNode = node.db.getRefForReading(['rules', 'test']);
-      const functionNode = node.db.getRefForReading(['functions', 'test']);
+      node.db.setValue("/apps/test/level0/level1/level2", { aaa: 'bbb' });
+      node.db.setOwner("/apps/test/empty_owners/.owner/owners/*/write_function", false);
+      node.db.setRule("/apps/test/test_rules", nestedRules);
+      node.db.setFunction("/apps/test/test_functions", dbFuncs);
+      const valuesNode = node.db.getRefForReading(['values', 'apps', 'test']);
+      const ownersNode = node.db.getRefForReading(['owners', 'apps', 'test']);
+      const rulesNode = node.db.getRefForReading(['rules', 'apps', 'test']);
+      const functionNode = node.db.getRefForReading(['functions', 'apps', 'test']);
       expect(valuesNode.getProofHash()).to.equal(valuesNode.buildProofHash());
       expect(ownersNode.getProofHash()).to.equal(ownersNode.buildProofHash());
       expect(rulesNode.getProofHash()).to.equal(rulesNode.buildProofHash());
@@ -3905,7 +4456,7 @@ describe("Proof hash", () => {
   describe("State proof (getStateProof)", () => {
     it("tests proof with a null case", () => {
       const rootNode = node.db.stateRoot;
-      assert.deepEqual(null, node.db.getStateProof('/test/test'));
+      assert.deepEqual(null, node.db.getStateProof('/apps/test/test'));
     });
 
     it("tests proof with owners, rules, values and functions", () => {
@@ -3941,10 +4492,10 @@ describe("Proof hash", () => {
           { [label]: { [ProofProperties.PROOF_HASH]: functionNode.getChild(label).getProofHash() } });
       });
       assert.deepEqual(rootProof, node.db.getStateProof('/'));
-      assert.deepEqual(ownersProof, node.db.getStateProof('/owners/test'));
-      assert.deepEqual(rulesProof, node.db.getStateProof('/rules/test'));
-      assert.deepEqual(valuesProof, node.db.getStateProof('/values/test'));
-      assert.deepEqual(functionsProof, node.db.getStateProof('/functions/test'));
+      assert.deepEqual(ownersProof, node.db.getStateProof('/owners/apps'));
+      assert.deepEqual(rulesProof, node.db.getStateProof('/rules/apps'));
+      assert.deepEqual(valuesProof, node.db.getStateProof('/values/apps'));
+      assert.deepEqual(functionsProof, node.db.getStateProof('/functions/apps'));
     });
   });
 });
@@ -3973,7 +4524,7 @@ describe("State info (getStateInfo)", () => {
         label22: 'value12',
       }
     };
-    result = node.db.setValue("test", valuesObject);
+    result = node.db.setValue("/apps/test", valuesObject);
     assert.deepEqual(result.code, 0);
   });
 
@@ -3983,74 +4534,155 @@ describe("State info (getStateInfo)", () => {
 
   describe("No tree structure change", () => {
     it("replace node values", () => {
-      result = node.db.setValue('test/label1/label12', {  // Only value updates
+      result = node.db.setValue('/apps/test/label1/label12', {  // Only value updates
         label121: 'new_value121',
         label122: 'new_value122'
       });
       assert.deepEqual(result.code, 0);
 
       // Existing paths.
-      assert.deepEqual(
-          node.db.getStateInfo('/values/test/label1'), { tree_height: 2, tree_size: 5 });
-      assert.deepEqual(
-          node.db.getStateInfo('/values/test/label1/label11'), { tree_height: 0, tree_size: 1 });
-      assert.deepEqual(
-          node.db.getStateInfo('/values/test/label1/label12'), { tree_height: 1, tree_size: 3 });
-      assert.deepEqual(
-          node.db.getStateInfo('/values/test/label1/label12/label121'),
-          { tree_height: 0, tree_size: 1 });
-      assert.deepEqual(
-          node.db.getStateInfo('/values/test/label1/label12/label122'),
-          { tree_height: 0, tree_size: 1 });
-      assert.deepEqual(
-          node.db.getStateInfo('/values/test/label2'), { tree_height: 1, tree_size: 3 });
-      assert.deepEqual(
-          node.db.getStateInfo('/values/test/label2/label21'), { tree_height: 0, tree_size: 1 });
-      assert.deepEqual(
-          node.db.getStateInfo('/values/test/label2/label22'), { tree_height: 0, tree_size: 1 });
+      assert.deepEqual(node.db.getStateInfo('/values/apps/test/label1'), {
+        "proof_hash": "0x213304021f1ea1e8f7954c815d49207c0a42ab4bdf09929263369fa5f4d77c8b",
+        "tree_bytes": 922,
+        "tree_height": 2,
+        "tree_size": 5,
+        "version": "NODE:0",
+      });
+      assert.deepEqual(node.db.getStateInfo('/values/apps/test/label1/label11'), {
+        "proof_hash": "0xa8681012b27ff56a45aa80f6f4d95c66c3349046cdd18cdc77028b6a634c9b0b",
+        "tree_bytes": 174,
+        "tree_height": 0,
+        "tree_size": 1,
+        "version": "NODE:0",
+      });
+      assert.deepEqual(node.db.getStateInfo('/values/apps/test/label1/label12'), {
+        "proof_hash": "0xbc8b6e1e9e369b5af09e14fea3769c348d66e453b3a2fc6dbec0d00278e094e7",
+        "tree_bytes": 560,
+        "tree_height": 1,
+        "tree_size": 3,
+        "version": "NODE:0",
+      });
+      assert.deepEqual(node.db.getStateInfo('/values/apps/test/label1/label12/label121'), {
+        "proof_hash": "0xfbe04067ec980e5d7364e8b6cf45f4bee9d53be89419211d0233aada9151ad50",
+        "tree_bytes": 184,
+        "tree_height": 0,
+        "tree_size": 1,
+        "version": "NODE:0",
+      });
+      assert.deepEqual(node.db.getStateInfo('/values/apps/test/label1/label12/label122'), {
+        "proof_hash": "0x8f17965ac862bad15172d21facff45ff3efb8a55ae50ca085131a3012e001c1f",
+        "tree_bytes": 184,
+        "tree_height": 0,
+        "tree_size": 1,
+        "version": "NODE:0",
+      });
+      assert.deepEqual(node.db.getStateInfo('/values/apps/test/label2'), {
+        "proof_hash": "0x7b614d2449c2ce477ac040c52b78798e5ff36a20b83115b6af8688f5e88a813f",
+        "tree_bytes": 536,
+        "tree_height": 1,
+        "tree_size": 3,
+        "version": "NODE:0",
+      });
+      assert.deepEqual(node.db.getStateInfo('/values/apps/test/label2/label21'), {
+        "proof_hash": "0xa8681012b27ff56a45aa80f6f4d95c66c3349046cdd18cdc77028b6a634c9b0b",
+        "tree_bytes": 174,
+        "tree_height": 0,
+        "tree_size": 1,
+        "version": "NODE:0",
+      });
+      assert.deepEqual(node.db.getStateInfo('/values/apps/test/label2/label22'), {
+        "proof_hash": "0xc0da1458b190e12347891ab14253518f5e43d95473cd2546dbf8852dfb3dc281",
+        "tree_bytes": 174,
+        "tree_height": 0,
+        "tree_size": 1,
+        "version": "NODE:0",
+      });
 
       // Non-existing paths.
-      assert.deepEqual(node.db.getStateInfo('/values/test/non-existing/path'), null);
+      assert.deepEqual(node.db.getStateInfo('/values/apps/test/non-existing/path'), null);
     });
   });
 
   describe("Tree reduction", () => {
     it("remove state nodes", () => {
-      result = node.db.setValue("test/label1/label12", null);  // Reduce tree
+      result = node.db.setValue("/apps/test/label1/label12", null);  // Reduce tree
       assert.deepEqual(result.code, 0);
 
-      assert.deepEqual(
-          node.db.getStateInfo('/values/test/label1'), { tree_height: 1, tree_size: 2 });
-      assert.deepEqual(
-          node.db.getStateInfo('/values/test/label1/label11'), { tree_height: 0, tree_size: 1 });
-      assert.deepEqual(node.db.getStateInfo('/values/test/label1/label12'), null);
-      assert.deepEqual(
-          node.db.getStateInfo('/values/test/label2'), { tree_height: 1, tree_size: 3 });
+      assert.deepEqual(node.db.getStateInfo('/values/apps/test/label1'), {
+        "proof_hash": "0x1b8f144f5692c88c242776485c0cafc184d4724942578752d083c615d84a1caa",
+        "tree_bytes": 348,
+        "tree_height": 1,
+        "tree_size": 2,
+        "version": "NODE:0",
+      });
+      assert.deepEqual(node.db.getStateInfo('/values/apps/test/label1/label11'), {
+        "proof_hash": "0xa8681012b27ff56a45aa80f6f4d95c66c3349046cdd18cdc77028b6a634c9b0b",
+        "tree_bytes": 174,
+        "tree_height": 0,
+        "tree_size": 1,
+        "version": "NODE:0",
+      });
+      assert.deepEqual(node.db.getStateInfo('/values/apps/test/label1/label12'), null);
+      assert.deepEqual(node.db.getStateInfo('/values/apps/test/label2'), {
+        "proof_hash": "0x7b614d2449c2ce477ac040c52b78798e5ff36a20b83115b6af8688f5e88a813f",
+        "tree_bytes": 536,
+        "tree_height": 1,
+        "tree_size": 3,
+        "version": "NODE:0",
+      });
     });
   });
 
   describe("Tree expansion", () => {
     it("add state nodes", () => {
-      result = node.db.setValue('test/label2/label21', {  // Expand tree
+      result = node.db.setValue('/apps/test/label2/label21', {  // Expand tree
         label211: 'value211',
         label212: 'value212'
       });
       assert.deepEqual(result.code, 0);
 
-      assert.deepEqual(
-          node.db.getStateInfo('/values/test/label1'), { tree_height: 2, tree_size: 5 });
-      assert.deepEqual(
-          node.db.getStateInfo('/values/test/label2'), { tree_height: 2, tree_size: 5 });
-      assert.deepEqual(
-          node.db.getStateInfo('/values/test/label2/label21'), { tree_height: 1, tree_size: 3 });
-      assert.deepEqual(
-          node.db.getStateInfo('/values/test/label2/label21/label211'),
-          { tree_height: 0, tree_size: 1 });
-      assert.deepEqual(
-          node.db.getStateInfo('/values/test/label2/label21/label212'),
-          { tree_height: 0, tree_size: 1 });
-      assert.deepEqual(
-          node.db.getStateInfo('/values/test/label2/label22'), { tree_height: 0, tree_size: 1 });
+      assert.deepEqual(node.db.getStateInfo('/values/apps/test/label1'), {
+        "proof_hash": "0x052b9dbac10fca45626652f264b9896216da0ce6f1b55d10934b7e9cb9141871",
+        "tree_bytes": 906,
+        "tree_height": 2,
+        "tree_size": 5,
+        "version": "NODE:0",
+      });
+      assert.deepEqual(node.db.getStateInfo('/values/apps/test/label2'), {
+        "proof_hash": "0x7da207e739139a3fabbcb53c9a2b91f786441b903ffd1de445e69d921f9f30af",
+        "tree_bytes": 906,
+        "tree_height": 2,
+        "tree_size": 5,
+        "version": "NODE:0",
+      });
+      assert.deepEqual(node.db.getStateInfo('/values/apps/test/label2/label21'), {
+        "proof_hash": "0x805586e32d13b938808c5e283c027d0fa7f8b496bdb6fdc8cd5a57d0b12c72af",
+        "tree_bytes": 544,
+        "tree_height": 1,
+        "tree_size": 3,
+        "version": "NODE:0",
+      });
+      assert.deepEqual(node.db.getStateInfo('/values/apps/test/label2/label21/label211'), {
+        "proof_hash": "0xc7b107bdd716d26c8fe34fbcec5b91d738c3f53ee09fdf047678e85181e5f90c",
+        "tree_bytes": 176,
+        "tree_height": 0,
+        "tree_size": 1,
+        "version": "NODE:0",
+      });
+      assert.deepEqual(node.db.getStateInfo('/values/apps/test/label2/label21/label212'), {
+        "proof_hash": "0x736c5dded3f67ab5717c8c7c1b15580cb0bbf23562edd4a6898f2c1a6ca63200",
+        "tree_bytes": 176,
+        "tree_height": 0,
+        "tree_size": 1,
+        "version": "NODE:0",
+      });
+      assert.deepEqual(node.db.getStateInfo('/values/apps/test/label2/label22'), {
+        "proof_hash": "0xc0da1458b190e12347891ab14253518f5e43d95473cd2546dbf8852dfb3dc281",
+        "tree_bytes": 174,
+        "tree_height": 0,
+        "tree_size": 1,
+        "version": "NODE:0",
+      });
     });
   });
 });
@@ -4087,7 +4719,7 @@ describe("State version handling", () => {
         }
       }
     };
-    result = node.db.setValue("test", dbValues);
+    result = node.db.setValue("/apps/test", dbValues);
     assert.deepEqual(result.code, 0);
   });
 
@@ -4098,15 +4730,15 @@ describe("State version handling", () => {
   describe("getRefForReading()", () => {
     it("the nodes on the path are not affected", () => {
       expect(node.db.deleteBackupStateVersion()).to.equal(true);
-      const child2 = node.db.stateRoot.getChild('values').getChild('test').getChild('child_2');
+      const child2 = node.db.stateRoot.getChild('values').getChild('apps').getChild('test').getChild('child_2');
       const child21 = child2.getChild('child_21');
       const child212 = child21.getChild('child_212');
 
-      expect(node.db.getRefForReading(['values', 'test', 'child_2', 'child_21', 'child_212']))
+      expect(node.db.getRefForReading(['values', 'apps', 'test', 'child_2', 'child_21', 'child_212']))
           .to.not.equal(null);
 
       // The nodes on the path are not affected.
-      const newChild2 = node.db.stateRoot.getChild('values').getChild('test').getChild('child_2');
+      const newChild2 = node.db.stateRoot.getChild('values').getChild('apps').getChild('test').getChild('child_2');
       const newChild21 = newChild2.getChild('child_21');
       const newChild212 = newChild21.getChild('child_212');
       expect(newChild2).to.equal(child2);  // Not cloned
@@ -4118,18 +4750,18 @@ describe("State version handling", () => {
   describe("getRefForWriting()", () => {
     it("the nodes of single access path are not cloned", () => {
       // First referencing to make the number of access paths = 1.
-      expect(node.db.getRefForWriting(['values', 'test', 'child_2', 'child_21', 'child_212']))
+      expect(node.db.getRefForWriting(['values', 'apps', 'test', 'child_2', 'child_21', 'child_212']))
           .to.not.equal(null);
-      const child2 = node.db.stateRoot.getChild('values').getChild('test').getChild('child_2');
+      const child2 = node.db.stateRoot.getChild('values').getChild('apps').getChild('test').getChild('child_2');
       const child21 = child2.getChild('child_21');
       const child212 = child21.getChild('child_212');
 
       // Second referencing.
-      expect(node.db.getRefForWriting(['values', 'test', 'child_2', 'child_21', 'child_212']))
+      expect(node.db.getRefForWriting(['values', 'apps', 'test', 'child_2', 'child_21', 'child_212']))
           .to.not.equal(null);
 
       // The nodes on the path are not cloned.
-      const newChild2 = node.db.stateRoot.getChild('values').getChild('test').getChild('child_2');
+      const newChild2 = node.db.stateRoot.getChild('values').getChild('apps').getChild('test').getChild('child_2');
       const newChild21 = newChild2.getChild('child_21');
       const newChild212 = newChild21.getChild('child_212');
       expect(newChild2).to.equal(child2);  // Not cloned
@@ -4141,15 +4773,15 @@ describe("State version handling", () => {
       // Make the number of roots = 2.
       const otherRoot = node.stateManager.cloneVersion(node.db.stateVersion, 'new version');
       expect(otherRoot).to.not.equal(null);
-      const child2 = node.db.stateRoot.getChild('values').getChild('test').getChild('child_2');
+      const child2 = node.db.stateRoot.getChild('values').getChild('apps').getChild('test').getChild('child_2');
       const child21 = child2.getChild('child_21');
       const child212 = child21.getChild('child_212');
 
-      expect(node.db.getRefForWriting(['values', 'test', 'child_2', 'child_21', 'child_212']))
+      expect(node.db.getRefForWriting(['values', 'apps', 'test', 'child_2', 'child_21', 'child_212']))
           .to.not.equal(null);
 
       // The nodes on the path are cloned.
-      const newChild2 = node.db.stateRoot.getChild('values').getChild('test').getChild('child_2');
+      const newChild2 = node.db.stateRoot.getChild('values').getChild('apps').getChild('test').getChild('child_2');
       const newChild21 = newChild2.getChild('child_21');
       const newChild212 = newChild21.getChild('child_212');
       expect(newChild2).to.not.equal(child2);  // Cloned.
@@ -4158,17 +4790,17 @@ describe("State version handling", () => {
     });
 
     it("the nodes of multiple access paths are cloned - multiple parents case 1", () => {
-      const child2 = node.db.stateRoot.getChild('values').getChild('test').getChild('child_2');
+      const child2 = node.db.stateRoot.getChild('values').getChild('apps').getChild('test').getChild('child_2');
       const child21 = child2.getChild('child_21');
       const child212 = child21.getChild('child_212');
       // Make child21's number of parents = 2.
       const clonedChild2 = child2.clone('new version');
 
-      expect(node.db.getRefForWriting(['values', 'test', 'child_2', 'child_21', 'child_212']))
+      expect(node.db.getRefForWriting(['values', 'apps', 'test', 'child_2', 'child_21', 'child_212']))
           .to.not.equal(null);
 
       // Only the nodes of multiple paths are cloned.
-      const newChild2 = node.db.stateRoot.getChild('values').getChild('test').getChild('child_2');
+      const newChild2 = node.db.stateRoot.getChild('values').getChild('apps').getChild('test').getChild('child_2');
       const newChild21 = newChild2.getChild('child_21');
       const newChild212 = newChild21.getChild('child_212');
       expect(newChild2).to.equal(child2);  // Not cloned.
@@ -4177,17 +4809,17 @@ describe("State version handling", () => {
     });
 
     it("the nodes of multiple access paths are cloned - multiple parents case 2", () => {
-      const child2 = node.db.stateRoot.getChild('values').getChild('test').getChild('child_2');
+      const child2 = node.db.stateRoot.getChild('values').getChild('apps').getChild('test').getChild('child_2');
       const child21 = child2.getChild('child_21');
       const child212 = child21.getChild('child_212');
       // Make child212's number of parents = 2.
       const clonedChild21 = child21.clone('new version');
 
-      expect(node.db.getRefForWriting(['values', 'test', 'child_2', 'child_21', 'child_212']))
+      expect(node.db.getRefForWriting(['values', 'apps', 'test', 'child_2', 'child_21', 'child_212']))
           .to.not.equal(null);
 
       // Only the nodes of multiple paths are cloned.
-      const newChild2 = node.db.stateRoot.getChild('values').getChild('test').getChild('child_2');
+      const newChild2 = node.db.stateRoot.getChild('values').getChild('apps').getChild('test').getChild('child_2');
       const newChild21 = newChild2.getChild('child_21');
       const newChild212 = newChild21.getChild('child_212');
       expect(newChild2).to.equal(child2);  // Not cloned.
@@ -4198,15 +4830,15 @@ describe("State version handling", () => {
     it("the on other ref paths are not affected", () => {
       const otherRoot = node.stateManager.cloneVersion(node.db.stateVersion, 'new version');
       expect(otherRoot).to.not.equal(null);
-      const beforeOtherChild2 = otherRoot.getChild('values').getChild('test').getChild('child_2');
+      const beforeOtherChild2 = otherRoot.getChild('values').getChild('apps').getChild('test').getChild('child_2');
       const beforeOtherChild21 = beforeOtherChild2.getChild('child_21');
       const beforeOtherChild212 = beforeOtherChild21.getChild('child_212');
 
-      expect(node.db.getRefForWriting(['values', 'test', 'child_2', 'child_21', 'child_212']))
+      expect(node.db.getRefForWriting(['values', 'apps', 'test', 'child_2', 'child_21', 'child_212']))
           .to.not.equal(null);
 
       // The nodes on the path from other roots are not affected.
-      const afterOtherChild2 = otherRoot.getChild('values').getChild('test').getChild('child_2');
+      const afterOtherChild2 = otherRoot.getChild('values').getChild('apps').getChild('test').getChild('child_2');
       const afterOtherChild21 = afterOtherChild2.getChild('child_21');
       const afterOtherChild212 = afterOtherChild21.getChild('child_212');
       expect(afterOtherChild2).to.equal(beforeOtherChild2);  // Not cloned
@@ -4214,26 +4846,26 @@ describe("State version handling", () => {
       expect(afterOtherChild212).to.equal(beforeOtherChild212);  // Not cloned
 
       // The state values of other roots are not affected.
-      assert.deepEqual(otherRoot.getChild('values').getChild('test').toJsObject(), dbValues);
+      assert.deepEqual(otherRoot.getChild('values').getChild('apps').getChild('test').toJsObject(), dbValues);
     });
   });
 
   describe("backupDb() / restoreDb()", () => {
     it("backuped states are restored", () => {
-      assert.deepEqual(node.db.getValue('test'), dbValues);
+      assert.deepEqual(node.db.getValue('/apps/test'), dbValues);
 
       assert.deepEqual(node.db.backupDb(), true);
       expect(node.db.backupStateVersion).to.not.equal(null);
       expect(node.db.backupStateRoot).to.not.equal(null);
-      assert.deepEqual(node.db.getValue('test'), dbValues);
+      assert.deepEqual(node.db.getValue('/apps/test'), dbValues);
       assert.deepEqual(
-          node.db.setValue('/test/child_2/child_21', { 'new_child': 'new_value' }).code, 0);
-      assert.deepEqual(node.db.getValue('/test/child_2/child_21'), { 'new_child': 'new_value' });
+          node.db.setValue('/apps/test/child_2/child_21', { 'new_child': 'new_value' }).code, 0);
+      assert.deepEqual(node.db.getValue('/apps/test/child_2/child_21'), { 'new_child': 'new_value' });
 
       assert.deepEqual(node.db.restoreDb(), true);
       expect(node.db.backupStateVersion).to.equal(null);
       expect(node.db.backupStateRoot).to.equal(null);
-      assert.deepEqual(node.db.getValue('test'), dbValues);
+      assert.deepEqual(node.db.getValue('/apps/test'), dbValues);
     });
   });
 });
diff --git a/unittest/functions.test.js b/unittest/functions.test.js
index 9a0c753a1..77d778fb3 100644
--- a/unittest/functions.test.js
+++ b/unittest/functions.test.js
@@ -33,11 +33,11 @@ describe("Functions", () => {
     });
 
     describe("Function triggering", () => {
-      const refPathRest = "/test/test_function/some/path/rest";
-      const refPathRestMulti = "/test/test_function/some/path/rest_multi";
-      const refPathRestWithoutListener = "/test/test_function/some/path/rest_without_listener";
-      const refPathRestNotWhitelisted = "/test/test_function/some/path/rest_not_whitelisted";
-      const refPathNull = "/test/test_function/some/path/null";
+      const refPathRest = "/apps/test/test_function/some/path/rest";
+      const refPathRestMulti = "/apps/test/test_function/some/path/rest_multi";
+      const refPathRestWithoutListener = "/apps/test/test_function/some/path/rest_without_listener";
+      const refPathRestNotWhitelisted = "/apps/test/test_function/some/path/rest_not_whitelisted";
+      const refPathNull = "/apps/test/test_function/some/path/null";
       let requestBody1 = null, requestBody2 = null;
 
       before(() => {
@@ -147,7 +147,7 @@ describe("Functions", () => {
         assert.deepEqual(func_results, {
           "0x11111": {
             "code": "SUCCESS",
-            "gas_amount": 10,
+            "bandwidth_gas_amount": 10,
           }
         });
         promise_results.then((resp) => {
@@ -349,7 +349,7 @@ describe("Functions", () => {
     })
 
     describe("Gas fee", () => {
-      const refPathRest = "/test/test_function/some/path/rest";
+      const refPathRest = "/apps/test/test_function/some/path/rest";
       const refPathTransfer =
           "/transfer/0x09A0d53FDf1c36A131938eb379b98910e55EEfe1/0x107Ab4369070716cEA7f0d34359fa6a99F54951F/0/value";
 
@@ -399,31 +399,31 @@ describe("Functions", () => {
             tx);
         assert.deepEqual(func_results, {
           "_transfer": {
-            "op_results": [
-             {
+            "op_results": {
+              "0": {
                 "path": "/accounts/0x09A0d53FDf1c36A131938eb379b98910e55EEfe1/balance",
                 "result": {
                   "code": 0,
-                  "gas_amount": 1
+                  "bandwidth_gas_amount": 1
                 }
               },
-              {
+              "1": {
                 "path": "/accounts/0x107Ab4369070716cEA7f0d34359fa6a99F54951F/balance",
                 "result": {
                   "code": 0,
-                  "gas_amount": 1
+                  "bandwidth_gas_amount": 1
                 }
               },
-              {
+              "2": {
                 "path": "/transfer/0x09A0d53FDf1c36A131938eb379b98910e55EEfe1/0x107Ab4369070716cEA7f0d34359fa6a99F54951F/0/result",
                 "result": {
                   "code": 0,
-                  "gas_amount": 1
+                  "bandwidth_gas_amount": 1
                 }
               }
-            ],
+            },
             "code": "SUCCESS",
-            "gas_amount": 1000
+            "bandwidth_gas_amount": 1000
           }
         });
         promise_results.then((resp) => {
@@ -454,31 +454,31 @@ describe("Functions", () => {
             tx);
         assert.deepEqual(func_results, {
           "_transfer": {
-            "op_results": [
-              {
+            "op_results": {
+              "0": {
                 "path": "/accounts/0x09A0d53FDf1c36A131938eb379b98910e55EEfe1/balance",
                 "result": {
                   "code": 0,
-                  "gas_amount": 1
+                  "bandwidth_gas_amount": 1
                 }
               },
-              {
+              "1": {
                 "path": "/accounts/0x107Ab4369070716cEA7f0d34359fa6a99F54951F/balance",
                 "result": {
                   "code": 0,
-                  "gas_amount": 1
+                  "bandwidth_gas_amount": 1
                 }
               },
-              {
+              "2": {
                 "path": "/transfer/0x09A0d53FDf1c36A131938eb379b98910e55EEfe1/0x107Ab4369070716cEA7f0d34359fa6a99F54951F/0/result",
                 "result": {
                   "code": 0,
-                  "gas_amount": 1
+                  "bandwidth_gas_amount": 1
                 }
               }
-            ],
+            },
             "code": "SUCCESS",
-            "gas_amount": 0
+            "bandwidth_gas_amount": 0
           }
         });
         promise_results.then((resp) => {
@@ -513,7 +513,7 @@ describe("Functions", () => {
         assert.deepEqual(func_results, {
           "0x11111": {
             "code": "SUCCESS",
-            "gas_amount": 10,
+            "bandwidth_gas_amount": 10,
           }
         });
         promise_results.then((resp) => {
diff --git a/unittest/p2p.test.js b/unittest/p2p.test.js
index a2b580414..1207b5038 100644
--- a/unittest/p2p.test.js
+++ b/unittest/p2p.test.js
@@ -123,10 +123,18 @@ describe("p2p", () => {
           address: p2pServer.getNodeAddress(),
           state: 'STARTING',
           stateNumeric: 0,
-          nonce: null,
+          nonce: 0,
           dbStatus: {
-            stateInfo: { tree_height: null, tree_size: null },
-            stateProof: { '.proof_hash': null }
+            stateInfo: {
+              tree_height: 0,
+              tree_size: 0,
+              tree_bytes: 0,
+              proof_hash: null,
+              version: "NODE:-1",
+            },
+            stateProof: {
+              '.proof_hash': null
+            }
           },
           stateVersionStatus: {
             numVersions: 2,
@@ -144,7 +152,8 @@ describe("p2p", () => {
           available: 113007648768,
           free: 235339354112,
           total: 250685575168,
-          used: 15346221056
+          usage: 15346221056,
+          usagePercent: 10.1
         };
         assert.deepEqual(Object.keys(actual), Object.keys(p2pServer.getDiskUsage()));
       });
@@ -152,7 +161,7 @@ describe("p2p", () => {
 
     describe("getCpuUsage", () => {
       it("gets initial cpu usage (it depends on the machine)", () => {
-        const actual = { free: 3174023060, usage: 313233920, total: 3487256980 };
+        const actual = { free: 3174023060, usage: 313233920, usagePercent: 7.5, total: 3487256980 };
         assert.deepEqual(Object.keys(actual), Object.keys(p2pServer.getCpuUsage()));
       });
     });
@@ -160,7 +169,12 @@ describe("p2p", () => {
     describe("getMemoryUsage", () => {
       it("gets initial memory usage (it depends on the machine)", () => {
         const actual = {
-          os: { free: 211546112, usage: 16968323072, total: 17179869184 },
+          os: {
+            free: 211546112,
+            usage: 16968323072,
+            usagePercent: 30.3,
+            total: 17179869184
+          },
           heap: {
             rss: 80953344,
             heapTotal: 56041472,
@@ -212,6 +226,7 @@ describe("p2p", () => {
             NETWORK_OPTIMIZATION: undefined,
             GENESIS_CONFIGS_DIR: undefined,
             MIN_NUM_VALIDATORS: undefined,
+            MAX_NUM_VALIDATORS: undefined,
             ACCOUNT_INDEX: undefined,
             P2P_PORT: undefined,
             PORT: undefined,
diff --git a/unittest/state-node.test.js b/unittest/state-node.test.js
index db38178bb..8c8525031 100644
--- a/unittest/state-node.test.js
+++ b/unittest/state-node.test.js
@@ -5,6 +5,7 @@ const assert = chai.assert;
 
 const CommonUtil = require('../common/common-util');
 const { HASH_DELIMITER } = require('../common/constants');
+const { GET_OPTIONS_INCLUDE_ALL } = require('./test-util');
 
 describe("state-node", () => {
   let node;
@@ -48,6 +49,7 @@ describe("state-node", () => {
   describe("Initialization with version", () => {
     it("constructor", () => {
       const node2 = new StateNode('version1');
+      expect(node2.version).to.equal('version1');
       expect(node2.isLeaf).to.equal(true);
       expect(node2.parentSet).to.not.be.null;
       expect(node2.childMap).to.not.be.null;
@@ -57,7 +59,9 @@ describe("state-node", () => {
       assert.deepEqual(node2.getChildNodes(), []);
       expect(node2.value).to.equal(null);
       expect(node2.proofHash).to.equal(null);
-      expect(node2.version).to.equal('version1');
+      expect(node2.treeHeight).to.equal(0);
+      expect(node2.treeSize).to.equal(0);
+      expect(node2.treeBytes).to.equal(0);
     });
   });
 
@@ -68,14 +72,17 @@ describe("state-node", () => {
       node.setVersion('version1');
 
       const clone = node.clone();
+      expect(clone.getVersion()).to.equal(node.getVersion());
       expect(clone.getIsLeaf()).to.equal(true);
       assert.deepEqual(clone.getParentNodes(), []);
       assert.deepEqual(clone.getChildLabels(), []);
       assert.deepEqual(clone.getChildNodes(), []);
       expect(clone.getValue()).to.equal('value0');
       expect(clone.getProofHash()).to.equal('hash');
-      expect(clone.getVersion()).to.equal(node.getVersion());
-      assert.deepEqual(clone.toJsObject(true), node.toJsObject(true));
+      expect(clone.getTreeHeight()).to.equal(node.getTreeHeight());
+      expect(clone.getTreeSize()).to.equal(node.getTreeSize());
+      expect(clone.getTreeBytes()).to.equal(node.getTreeBytes());
+      assert.deepEqual(clone.toJsObject(GET_OPTIONS_INCLUDE_ALL), node.toJsObject(GET_OPTIONS_INCLUDE_ALL));
       expect(node.equal(clone)).to.equal(true);
     });
 
@@ -88,6 +95,7 @@ describe("state-node", () => {
       assert.deepEqual(child3.getParentNodes(), [stateTree]);
 
       const clone = stateTree.clone();
+      expect(clone.getVersion()).to.equal(stateTree.getVersion());
       expect(clone.getIsLeaf()).to.equal(false);
       assert.deepEqual(child1.getParentNodes(), [stateTree, clone]);
       assert.deepEqual(child2.getParentNodes(), [stateTree, clone]);
@@ -97,8 +105,10 @@ describe("state-node", () => {
       assert.deepEqual(clone.getChildNodes(), stateTree.getChildNodes());
       expect(clone.getValue()).to.equal(null);
       expect(clone.getProofHash()).to.equal('hash');
-      expect(clone.getVersion()).to.equal(stateTree.getVersion());
-      assert.deepEqual(clone.toJsObject(true), stateTree.toJsObject(true));
+      expect(clone.getTreeHeight()).to.equal(stateTree.getTreeHeight());
+      expect(clone.getTreeSize()).to.equal(stateTree.getTreeSize());
+      expect(clone.getTreeBytes()).to.equal(stateTree.getTreeBytes());
+      assert.deepEqual(clone.toJsObject(GET_OPTIONS_INCLUDE_ALL), stateTree.toJsObject(GET_OPTIONS_INCLUDE_ALL));
       expect(stateTree.equal(clone)).to.equal(true);
     });
   });
@@ -110,13 +120,16 @@ describe("state-node", () => {
       node.setVersion('version1');
 
       const clone = node.clone('version2');
+      expect(clone.getVersion()).to.equal('version2');
       expect(clone.getIsLeaf()).to.equal(true);
       assert.deepEqual(clone.getParentNodes(), []);
       assert.deepEqual(clone.getChildLabels(), []);
       assert.deepEqual(clone.getChildNodes(), []);
       expect(clone.getValue()).to.equal('value0');
       expect(clone.getProofHash()).to.equal('hash');
-      expect(clone.getVersion()).to.equal('version2');
+      expect(clone.getTreeHeight()).to.equal(node.getTreeHeight());
+      expect(clone.getTreeSize()).to.equal(node.getTreeSize());
+      expect(clone.getTreeBytes()).to.equal(node.getTreeBytes());
     });
 
     it("internal node", () => {
@@ -128,6 +141,7 @@ describe("state-node", () => {
       assert.deepEqual(child3.getParentNodes(), [stateTree]);
 
       const clone = stateTree.clone('version2');
+      expect(clone.getVersion()).to.equal('version2');
       expect(clone.getIsLeaf()).to.equal(false);
       assert.deepEqual(child1.getParentNodes(), [stateTree, clone]);
       assert.deepEqual(child2.getParentNodes(), [stateTree, clone]);
@@ -137,7 +151,9 @@ describe("state-node", () => {
       assert.deepEqual(clone.getChildNodes(), stateTree.getChildNodes());
       expect(clone.getValue()).to.equal(null);
       expect(clone.getProofHash()).to.equal('hash');
-      expect(clone.getVersion()).to.equal('version2');
+      expect(clone.getTreeHeight()).to.equal(stateTree.getTreeHeight());
+      expect(clone.getTreeSize()).to.equal(stateTree.getTreeSize());
+      expect(clone.getTreeBytes()).to.equal(stateTree.getTreeBytes());
     });
   });
 
@@ -280,11 +296,11 @@ describe("state-node", () => {
     it("leaf node", () => {
       const ver1 = 'ver1';
 
-      expect(StateNode.fromJsObject(true, ver1).toJsObject(true)).to.equal(true);
-      expect(StateNode.fromJsObject(false, ver1).toJsObject(true)).to.equal(false);
-      expect(StateNode.fromJsObject(10, ver1).toJsObject(true)).to.equal(10);
-      expect(StateNode.fromJsObject('str', ver1).toJsObject(true)).to.equal('str');
-      expect(StateNode.fromJsObject(null, ver1).toJsObject(true)).to.equal(null);
+      expect(StateNode.fromJsObject(true, ver1).toJsObject(GET_OPTIONS_INCLUDE_ALL)).to.equal(true);
+      expect(StateNode.fromJsObject(false, ver1).toJsObject(GET_OPTIONS_INCLUDE_ALL)).to.equal(false);
+      expect(StateNode.fromJsObject(10, ver1).toJsObject(GET_OPTIONS_INCLUDE_ALL)).to.equal(10);
+      expect(StateNode.fromJsObject('str', ver1).toJsObject(GET_OPTIONS_INCLUDE_ALL)).to.equal('str');
+      expect(StateNode.fromJsObject(null, ver1).toJsObject(GET_OPTIONS_INCLUDE_ALL)).to.equal(null);
     })
 
     it("internal node", () => {
@@ -317,8 +333,186 @@ describe("state-node", () => {
           empty_obj: {},
         }
       };
-      // Expect no updates on proof hash and state info (tree height and tree size).
-      assert.deepEqual(StateNode.fromJsObject(stateObj, ver1).toJsObject(true), {
+
+      // Expect no updates on tree info.
+      assert.deepEqual(StateNode.fromJsObject(stateObj, ver1).toJsObject({ includeTreeInfo: true }), {
+        ".num_parents": 0,
+        ".num_parents:bool": 1,
+        ".num_parents:empty_obj": 1,
+        ".num_parents:empty_str": 1,
+        ".num_parents:null": 1,
+        ".num_parents:number": 1,
+        ".num_parents:str": 1,
+        ".num_parents:undef": 1,
+        ".tree_height": 0,
+        ".tree_height:bool": 0,
+        ".tree_height:empty_obj": 0,
+        ".tree_height:empty_str": 0,
+        ".tree_height:null": 0,
+        ".tree_height:number": 0,
+        ".tree_height:str": 0,
+        ".tree_height:undef": 0,
+        ".tree_size": 0,
+        ".tree_size:bool": 0,
+        ".tree_size:empty_obj": 0,
+        ".tree_size:empty_str": 0,
+        ".tree_size:null": 0,
+        ".tree_size:number": 0,
+        ".tree_size:str": 0,
+        ".tree_size:undef": 0,
+        ".tree_bytes": 0,
+        ".tree_bytes:bool": 0,
+        ".tree_bytes:empty_obj": 0,
+        ".tree_bytes:empty_str": 0,
+        ".tree_bytes:null": 0,
+        ".tree_bytes:number": 0,
+        ".tree_bytes:str": 0,
+        ".tree_bytes:undef": 0,
+        bool: false,
+        number: 10,
+        str: 'str',
+        empty_str: '',
+        null: null,
+        undef: undefined,
+        empty_obj: null,
+        subobj1: {
+          ".num_parents": 1,
+          ".num_parents:bool": 1,
+          ".num_parents:empty_obj": 1,
+          ".num_parents:empty_str": 1,
+          ".num_parents:null": 1,
+          ".num_parents:number": 1,
+          ".num_parents:str": 1,
+          ".num_parents:undef": 1,
+          ".tree_height": 0,
+          ".tree_height:bool": 0,
+          ".tree_height:empty_obj": 0,
+          ".tree_height:empty_str": 0,
+          ".tree_height:null": 0,
+          ".tree_height:number": 0,
+          ".tree_height:str": 0,
+          ".tree_height:undef": 0,
+          ".tree_size": 0,
+          ".tree_size:bool": 0,
+          ".tree_size:empty_obj": 0,
+          ".tree_size:empty_str": 0,
+          ".tree_size:null": 0,
+          ".tree_size:number": 0,
+          ".tree_size:str": 0,
+          ".tree_size:undef": 0,
+          ".tree_bytes": 0,
+          ".tree_bytes:bool": 0,
+          ".tree_bytes:empty_obj": 0,
+          ".tree_bytes:empty_str": 0,
+          ".tree_bytes:null": 0,
+          ".tree_bytes:number": 0,
+          ".tree_bytes:str": 0,
+          ".tree_bytes:undef": 0,
+          bool: true,
+          number: 20,
+          str: 'str2',
+          empty_str: '',
+          null: null,
+          undef: undefined,
+          empty_obj: null,
+        },
+        subobj2: {
+          ".num_parents": 1,
+          ".num_parents:bool": 1,
+          ".num_parents:empty_obj": 1,
+          ".num_parents:empty_str": 1,
+          ".num_parents:null": 1,
+          ".num_parents:number": 1,
+          ".num_parents:str": 1,
+          ".num_parents:undef": 1,
+          ".tree_height": 0,
+          ".tree_height:bool": 0,
+          ".tree_height:empty_obj": 0,
+          ".tree_height:empty_str": 0,
+          ".tree_height:null": 0,
+          ".tree_height:number": 0,
+          ".tree_height:str": 0,
+          ".tree_height:undef": 0,
+          ".tree_size": 0,
+          ".tree_size:bool": 0,
+          ".tree_size:empty_obj": 0,
+          ".tree_size:empty_str": 0,
+          ".tree_size:null": 0,
+          ".tree_size:number": 0,
+          ".tree_size:str": 0,
+          ".tree_size:undef": 0,
+          ".tree_bytes": 0,
+          ".tree_bytes:bool": 0,
+          ".tree_bytes:empty_obj": 0,
+          ".tree_bytes:empty_str": 0,
+          ".tree_bytes:null": 0,
+          ".tree_bytes:number": 0,
+          ".tree_bytes:str": 0,
+          ".tree_bytes:undef": 0,
+          bool: true,
+          number: -10,
+          str: 'str3',
+          empty_str: '',
+          null: null,
+          undef: undefined,
+          empty_obj: null,
+        }
+      });
+
+      // Expect no updates on state proof.
+      assert.deepEqual(StateNode.fromJsObject(stateObj, ver1).toJsObject({ includeProof: true }), {
+        ".proof_hash": null,
+        ".proof_hash:bool": null,
+        ".proof_hash:empty_obj": null,
+        ".proof_hash:empty_str": null,
+        ".proof_hash:null": null,
+        ".proof_hash:number": null,
+        ".proof_hash:str": null,
+        ".proof_hash:undef": null,
+        bool: false,
+        number: 10,
+        str: 'str',
+        empty_str: '',
+        null: null,
+        undef: undefined,
+        empty_obj: null,
+        subobj1: {
+          ".proof_hash": null,
+          ".proof_hash:bool": null,
+          ".proof_hash:empty_obj": null,
+          ".proof_hash:empty_str": null,
+          ".proof_hash:null": null,
+          ".proof_hash:number": null,
+          ".proof_hash:str": null,
+          ".proof_hash:undef": null,
+          bool: true,
+          number: 20,
+          str: 'str2',
+          empty_str: '',
+          null: null,
+          undef: undefined,
+          empty_obj: null,
+        },
+        subobj2: {
+          ".proof_hash": null,
+          ".proof_hash:bool": null,
+          ".proof_hash:empty_obj": null,
+          ".proof_hash:empty_str": null,
+          ".proof_hash:null": null,
+          ".proof_hash:number": null,
+          ".proof_hash:str": null,
+          ".proof_hash:undef": null,
+          bool: true,
+          number: -10,
+          str: 'str3',
+          empty_str: '',
+          null: null,
+          undef: undefined,
+          empty_obj: null,
+        }
+      });
+
+      assert.deepEqual(StateNode.fromJsObject(stateObj, ver1).toJsObject({ includeVersion: true }), {
         ".version": "ver1",
         ".version:bool": "ver1",
         ".version:empty_obj": "ver1",
@@ -327,38 +521,6 @@ describe("state-node", () => {
         ".version:number": "ver1",
         ".version:str": "ver1",
         ".version:undef": "ver1",
-        ".numParents": 0,
-        ".numParents:bool": 1,
-        ".numParents:empty_obj": 1,
-        ".numParents:empty_str": 1,
-        ".numParents:null": 1,
-        ".numParents:number": 1,
-        ".numParents:str": 1,
-        ".numParents:undef": 1,
-        ".proofHash": null,
-        ".proofHash:bool": null,
-        ".proofHash:empty_obj": null,
-        ".proofHash:empty_str": null,
-        ".proofHash:null": null,
-        ".proofHash:number": null,
-        ".proofHash:str": null,
-        ".proofHash:undef": null,
-        ".treeHeight": null,
-        ".treeHeight:bool": null,
-        ".treeHeight:empty_obj": null,
-        ".treeHeight:empty_str": null,
-        ".treeHeight:null": null,
-        ".treeHeight:number": null,
-        ".treeHeight:str": null,
-        ".treeHeight:undef": null,
-        ".treeSize": null,
-        ".treeSize:bool": null,
-        ".treeSize:empty_obj": null,
-        ".treeSize:empty_str": null,
-        ".treeSize:null": null,
-        ".treeSize:number": null,
-        ".treeSize:str": null,
-        ".treeSize:undef": null,
         bool: false,
         number: 10,
         str: 'str',
@@ -375,38 +537,6 @@ describe("state-node", () => {
           ".version:number": "ver1",
           ".version:str": "ver1",
           ".version:undef": "ver1",
-          ".numParents": 1,
-          ".numParents:bool": 1,
-          ".numParents:empty_obj": 1,
-          ".numParents:empty_str": 1,
-          ".numParents:null": 1,
-          ".numParents:number": 1,
-          ".numParents:str": 1,
-          ".numParents:undef": 1,
-          ".proofHash": null,
-          ".proofHash:bool": null,
-          ".proofHash:empty_obj": null,
-          ".proofHash:empty_str": null,
-          ".proofHash:null": null,
-          ".proofHash:number": null,
-          ".proofHash:str": null,
-          ".proofHash:undef": null,
-          ".treeHeight": null,
-          ".treeHeight:bool": null,
-          ".treeHeight:empty_obj": null,
-          ".treeHeight:empty_str": null,
-          ".treeHeight:null": null,
-          ".treeHeight:number": null,
-          ".treeHeight:str": null,
-          ".treeHeight:undef": null,
-          ".treeSize": null,
-          ".treeSize:bool": null,
-          ".treeSize:empty_obj": null,
-          ".treeSize:empty_str": null,
-          ".treeSize:null": null,
-          ".treeSize:number": null,
-          ".treeSize:str": null,
-          ".treeSize:undef": null,
           bool: true,
           number: 20,
           str: 'str2',
@@ -424,38 +554,6 @@ describe("state-node", () => {
           ".version:number": "ver1",
           ".version:str": "ver1",
           ".version:undef": "ver1",
-          ".numParents": 1,
-          ".numParents:bool": 1,
-          ".numParents:empty_obj": 1,
-          ".numParents:empty_str": 1,
-          ".numParents:null": 1,
-          ".numParents:number": 1,
-          ".numParents:str": 1,
-          ".numParents:undef": 1,
-          ".proofHash": null,
-          ".proofHash:bool": null,
-          ".proofHash:empty_obj": null,
-          ".proofHash:empty_str": null,
-          ".proofHash:null": null,
-          ".proofHash:number": null,
-          ".proofHash:str": null,
-          ".proofHash:undef": null,
-          ".treeHeight": null,
-          ".treeHeight:bool": null,
-          ".treeHeight:empty_obj": null,
-          ".treeHeight:empty_str": null,
-          ".treeHeight:null": null,
-          ".treeHeight:number": null,
-          ".treeHeight:str": null,
-          ".treeHeight:undef": null,
-          ".treeSize": null,
-          ".treeSize:bool": null,
-          ".treeSize:empty_obj": null,
-          ".treeSize:empty_str": null,
-          ".treeSize:null": null,
-          ".treeSize:number": null,
-          ".treeSize:str": null,
-          ".treeSize:undef": null,
           bool: true,
           number: -10,
           str: 'str3',
@@ -468,26 +566,26 @@ describe("state-node", () => {
     })
   })
 
-  describe("fromJsObject with version / toJsObjectShallow", () => {
+  describe("fromJsObject with version / toJsObject with isShallow", () => {
     it("leaf node", () => {
       const ver = 'test_version';
-      expect(StateNode.fromJsObject(true, ver).toJsObjectShallow()).to.equal(true);
-      expect(StateNode.fromJsObject(false, ver).toJsObjectShallow()).to.equal(false);
-      expect(StateNode.fromJsObject(10, ver).toJsObjectShallow()).to.equal(10);
-      expect(StateNode.fromJsObject('str', ver).toJsObjectShallow()).to.equal('str');
-      expect(StateNode.fromJsObject(null, ver).toJsObjectShallow()).to.equal(null);
+      expect(StateNode.fromJsObject(true, ver).toJsObject({ isShallow: true })).to.equal(true);
+      expect(StateNode.fromJsObject(false, ver).toJsObject({ isShallow: true })).to.equal(false);
+      expect(StateNode.fromJsObject(10, ver).toJsObject({ isShallow: true })).to.equal(10);
+      expect(StateNode.fromJsObject('str', ver).toJsObject({ isShallow: true })).to.equal('str');
+      expect(StateNode.fromJsObject(null, ver).toJsObject({ isShallow: true })).to.equal(null);
     })
 
     it("internal node", () => {
       const ver = 'test_version';
-      assert.deepEqual(StateNode.fromJsObject({ a: 1, b: 2, c: 3 }, ver).toJsObjectShallow(),
+      assert.deepEqual(StateNode.fromJsObject({ a: 1, b: 2, c: 3 }, ver).toJsObject({ isShallow: true }),
           {
             a: true,
             b: true,
             c: true,
           },
       );
-      assert.deepEqual(StateNode.fromJsObject({ a: { aa: 11 }, b: 2 }, ver).toJsObjectShallow(),
+      assert.deepEqual(StateNode.fromJsObject({ a: { aa: 11 }, b: 2 }, ver).toJsObject({ isShallow: true }),
           {
             a: true,
             b: true,
@@ -972,7 +1070,7 @@ describe("state-node", () => {
 
   describe("tree height", () => {
     it("getTreeHeight / setTreeHeight", () => {
-      expect(node.getTreeHeight()).to.equal(null);
+      expect(node.getTreeHeight()).to.equal(0);
       node.setTreeHeight(10);
       expect(node.getTreeHeight()).to.equal(10);
       node.setTreeHeight(5);
@@ -982,7 +1080,7 @@ describe("state-node", () => {
 
   describe("tree size", () => {
     it("getTreeSize / setTreeSize", () => {
-      expect(node.getTreeSize()).to.equal(null);
+      expect(node.getTreeSize()).to.equal(0);
       node.setTreeSize(10);
       expect(node.getTreeSize()).to.equal(10);
       node.setTreeSize(5);
@@ -990,6 +1088,16 @@ describe("state-node", () => {
     });
   });
 
+  describe("tree bytes", () => {
+    it("getTreeBytes / setTreeBytes", () => {
+      expect(node.getTreeBytes()).to.equal(0);
+      node.setTreeBytes(10);
+      expect(node.getTreeBytes()).to.equal(10);
+      node.setTreeBytes(5);
+      expect(node.getTreeBytes()).to.equal(5);
+    });
+  });
+
   describe("buildProofHash", () => {
     it("leaf node", () => {
       node.setValue(true);
@@ -1021,6 +1129,32 @@ describe("state-node", () => {
     });
   });
 
+  describe("computeTreeHeight", () => {
+    it("leaf node", () => {
+      node.setValue(true);
+      expect(node.computeTreeHeight()).to.equal(0);
+      node.setValue(10);
+      expect(node.computeTreeHeight()).to.equal(0);
+      node.setValue(-200);
+      expect(node.computeTreeHeight()).to.equal(0);
+      node.setValue('');
+      expect(node.computeTreeHeight()).to.equal(0);
+      node.setValue('unittest');
+      expect(node.computeTreeHeight()).to.equal(0);
+      node.setValue(null);
+      expect(node.computeTreeHeight()).to.equal(0);
+      node.setValue(undefined);
+      expect(node.computeTreeHeight()).to.equal(0);
+    });
+
+    it("internal node", () => {
+      child1.setTreeHeight(0);
+      child2.setTreeHeight(1);
+      child3.setTreeHeight(2);
+      expect(stateTree.computeTreeHeight()).to.equal(3);
+    });
+  });
+
   describe("computeTreeSize", () => {
     it("leaf node", () => {
       node.setValue(true);
@@ -1047,29 +1181,55 @@ describe("state-node", () => {
     });
   });
 
-  describe("computeTreeHeight", () => {
+  describe("computeTreeBytes", () => {
     it("leaf node", () => {
-      node.setValue(true);
-      expect(node.computeTreeHeight()).to.equal(0);
-      node.setValue(10);
-      expect(node.computeTreeHeight()).to.equal(0);
-      node.setValue(-200);
-      expect(node.computeTreeHeight()).to.equal(0);
-      node.setValue('');
-      expect(node.computeTreeHeight()).to.equal(0);
-      node.setValue('unittest');
-      expect(node.computeTreeHeight()).to.equal(0);
-      node.setValue(null);
-      expect(node.computeTreeHeight()).to.equal(0);
-      node.setValue(undefined);
-      expect(node.computeTreeHeight()).to.equal(0);
+      const parent = new StateNode();
+      parent.setChild('child', node);
+
+      // node.parentSet : ref set (1 * 8 = 8 bytes)
+      node.setVersion('ver');  // string (3 * 2 = 6 bytes)
+      // node.isLeaf : boolean (4 bytses)
+      node.setProofHash('hash');  // string (4 * 2 = 8 bytses)
+      // node.treeHeight : number (8 bytses)
+      // node.treeSize : number (8 bytses)
+      // node.treeBytes : number (8 bytes)
+      // TOTAL: 50 - 6 = 44 bytes (exclude version)
+
+      node.setValue(true);  // boolean (4 bytes)
+      expect(node.computeTreeBytes()).to.equal(40);
+      node.setValue(10);  // number (8 bytes)
+      expect(node.computeTreeBytes()).to.equal(44);
+      node.setValue(-200);  // number (8 bytes)
+      expect(node.computeTreeBytes()).to.equal(44);
+      node.setValue('');  // string (0 * 2 = 0 bytes)
+      expect(node.computeTreeBytes()).to.equal(36);
+      node.setValue('str');  // string (3 * 2 = 6 bytes)
+      expect(node.computeTreeBytes()).to.equal(42);
+      node.setValue(null);  // null (0 bytes)
+      expect(node.computeTreeBytes()).to.equal(36);
+      node.setValue(undefined);  // undefined (0 bytes)
+      expect(node.computeTreeBytes()).to.equal(36);
     });
 
     it("internal node", () => {
-      child1.setTreeHeight(0);
-      child2.setTreeHeight(1);
-      child3.setTreeHeight(2);
-      expect(stateTree.computeTreeHeight()).to.equal(3);
+      const parent = new StateNode();
+      parent.setChild('child', stateTree);
+
+      // stateTree.parentSet : ref set (1 * 8 = 8 bytes)
+      // stateTree.childMap : ref map (3 * 8 = 24 bytes)
+      stateTree.setVersion('ver');  // string (3 * 2 = 6 bytes)
+      // stateTree.isLeaf : boolean (4 bytses)
+      stateTree.setProofHash('hash');  // string (4 * 2 = 8 bytses)
+      // stateTree.treeHeight : number (8 bytses)
+      // stateTree.treeSize : number (8 bytses)
+      // stateTree.treeBytes : number (8 bytes)
+      // TOTAL: 74 - 6 = 68 bytes (exclude version)
+
+      child1.setTreeBytes(10);
+      child2.setTreeBytes(20);
+      child3.setTreeBytes(30);
+      // 68 + 6('label1') * 2 + 10 + 6('label2') * 2 + 20 + 6('label3') * 2 + 30 = 164
+      expect(stateTree.computeTreeBytes()).to.equal(132);
     });
   });
 
diff --git a/unittest/state-util.test.js b/unittest/state-util.test.js
index 99f4b5907..2b0dff28d 100644
--- a/unittest/state-util.test.js
+++ b/unittest/state-util.test.js
@@ -25,9 +25,8 @@ const {
   updateProofHashForAllRootPaths,
   verifyProofHashForStateTree
 } = require('../db/state-util');
-const {
-  STATE_LABEL_LENGTH_LIMIT,
-} = require('../common/constants');
+const { STATE_LABEL_LENGTH_LIMIT } = require('../common/constants');
+const { GET_OPTIONS_INCLUDE_ALL } = require('./test-util');
 const StateNode = require('../db/state-node');
 const chai = require('chai');
 const expect = chai.expect;
@@ -594,7 +593,9 @@ describe("state-util", () => {
           }
         },
         "rules": {
-          ".write": true
+          ".rule": {
+            "write": true
+          }
         }
       }), {isValid: true, invalidPath: ''});
       assert.deepEqual(
@@ -688,12 +689,12 @@ describe("state-util", () => {
     })
 
     it("when valid input", () => {
-      assert.deepEqual(isValidRuleConfig(true), {isValid: true, invalidPath: ''});
-      assert.deepEqual(isValidRuleConfig(false), {isValid: true, invalidPath: ''});
-      assert.deepEqual(isValidRuleConfig("auth.addr === 'abcd'"), {isValid: true, invalidPath: ''});
-      assert.deepEqual(isValidRuleConfig(
-          "(auth.addr === $from || auth.fid === '_stake' || auth.fid === '_unstake' || auth.fid === '_pay' || auth.fid === '_claim' || auth.fid === '_hold' || auth.fid === '_release' || auth.fid === '_collectFee' || auth.fid === '_distributeFee') && !getValue('transfer/' + $from + '/' + $to + '/' + $key) && (util.isServAcntName($from) || util.isCksumAddr($from)) && (util.isServAcntName($to) || util.isCksumAddr($to)) && $from !== $to && util.isNumber(newData) && getValue(util.getBalancePath($from)) >= newData"),
-          {isValid: true, invalidPath: ''});
+      assert.deepEqual(isValidRuleConfig({ "write": true }), {isValid: true, invalidPath: ''});
+      assert.deepEqual(isValidRuleConfig({ "write": false }), {isValid: true, invalidPath: ''});
+      assert.deepEqual(isValidRuleConfig({ "write": "auth.addr === 'abcd'" }), {isValid: true, invalidPath: ''});
+      assert.deepEqual(isValidRuleConfig({
+        "write": "(auth.addr === $from || auth.fid === '_stake' || auth.fid === '_unstake' || auth.fid === '_pay' || auth.fid === '_claim' || auth.fid === '_hold' || auth.fid === '_release' || auth.fid === '_collectFee' || auth.fid === '_distributeFee') && !getValue('transfer/' + $from + '/' + $to + '/' + $key) && (util.isServAcntName($from) || util.isCksumAddr($from)) && (util.isServAcntName($to) || util.isCksumAddr($to)) && $from !== $to && util.isNumber(newData) && getValue(util.getBalancePath($from)) >= newData"
+      }), {isValid: true, invalidPath: ''});
     })
   })
 
@@ -734,33 +735,44 @@ describe("state-util", () => {
     it("when invalid input with invalid owner config", () => {
       assert.deepEqual(isValidRuleTree({
         some_path: {
-          '.write': {
+          '.rule': {
+            'write': {}
           }
         }
-      }), {isValid: false, invalidPath: '/some_path/.write'});
+      }), {isValid: false, invalidPath: '/some_path/.rule/write'});
       assert.deepEqual(isValidRuleTree({
         some_path: {
-          '.write': null 
+          '.rule': {
+            'write': null 
+          }
         }
-      }), {isValid: false, invalidPath: '/some_path/.write'});
+      }), {isValid: false, invalidPath: '/some_path/.rule/write'});
       assert.deepEqual(isValidRuleTree({
         some_path: {
-          '.write': undefined
+          '.rule': {
+            'write': undefined
+          }
         }
-      }), {isValid: false, invalidPath: '/some_path/.write'});
+      }), {isValid: false, invalidPath: '/some_path/.rule/write'});
     })
 
     it("when valid input", () => {
       assert.deepEqual(isValidRuleTree(null), {isValid: true, invalidPath: ''});
       assert.deepEqual(isValidRuleTree({
-        '.write': true 
+        '.rule': {
+          'write': true 
+        }
       }), {isValid: true, invalidPath: ''});
       assert.deepEqual(isValidRuleTree({
         some_path1: {
-          '.write': true
+          '.rule': {
+            'write': true
+          }
         },
         some_path2: {
-          '.write': "auth.addr === 'abcd'"
+          '.rule': {
+            'write': "auth.addr === 'abcd'"
+          }
         }
       }), {isValid: true, invalidPath: ''});
     })
@@ -1727,7 +1739,7 @@ describe("state-util", () => {
       const stateTree = StateNode.fromJsObject(stateObj);
       const numNodes = setStateTreeVersion(stateTree, ver1);
       expect(numNodes).to.equal(24);
-      assert.deepEqual(stateTree.toJsObject(true), {
+      assert.deepEqual(stateTree.toJsObject(GET_OPTIONS_INCLUDE_ALL), {
         ".version": "ver1",
         ".version:bool": "ver1",
         ".version:empty_obj": "ver1",
@@ -1736,38 +1748,46 @@ describe("state-util", () => {
         ".version:number": "ver1",
         ".version:str": "ver1",
         ".version:undef": "ver1",
-        ".numParents": 0,
-        ".numParents:bool": 1,
-        ".numParents:empty_obj": 1,
-        ".numParents:empty_str": 1,
-        ".numParents:null": 1,
-        ".numParents:number": 1,
-        ".numParents:str": 1,
-        ".numParents:undef": 1,
-        ".proofHash": null,
-        ".proofHash:bool": null,
-        ".proofHash:empty_obj": null,
-        ".proofHash:empty_str": null,
-        ".proofHash:null": null,
-        ".proofHash:number": null,
-        ".proofHash:str": null,
-        ".proofHash:undef": null,
-        ".treeHeight": null,
-        ".treeHeight:bool": null,
-        ".treeHeight:empty_obj": null,
-        ".treeHeight:empty_str": null,
-        ".treeHeight:null": null,
-        ".treeHeight:number": null,
-        ".treeHeight:str": null,
-        ".treeHeight:undef": null,
-        ".treeSize": null,
-        ".treeSize:bool": null,
-        ".treeSize:empty_obj": null,
-        ".treeSize:empty_str": null,
-        ".treeSize:null": null,
-        ".treeSize:number": null,
-        ".treeSize:str": null,
-        ".treeSize:undef": null,
+        ".num_parents": 0,
+        ".num_parents:bool": 1,
+        ".num_parents:empty_obj": 1,
+        ".num_parents:empty_str": 1,
+        ".num_parents:null": 1,
+        ".num_parents:number": 1,
+        ".num_parents:str": 1,
+        ".num_parents:undef": 1,
+        ".proof_hash": null,
+        ".proof_hash:bool": null,
+        ".proof_hash:empty_obj": null,
+        ".proof_hash:empty_str": null,
+        ".proof_hash:null": null,
+        ".proof_hash:number": null,
+        ".proof_hash:str": null,
+        ".proof_hash:undef": null,
+        ".tree_height": 0,
+        ".tree_height:bool": 0,
+        ".tree_height:empty_obj": 0,
+        ".tree_height:empty_str": 0,
+        ".tree_height:null": 0,
+        ".tree_height:number": 0,
+        ".tree_height:str": 0,
+        ".tree_height:undef": 0,
+        ".tree_size": 0,
+        ".tree_size:bool": 0,
+        ".tree_size:empty_obj": 0,
+        ".tree_size:empty_str": 0,
+        ".tree_size:null": 0,
+        ".tree_size:number": 0,
+        ".tree_size:str": 0,
+        ".tree_size:undef": 0,
+        ".tree_bytes": 0,
+        ".tree_bytes:bool": 0,
+        ".tree_bytes:empty_obj": 0,
+        ".tree_bytes:empty_str": 0,
+        ".tree_bytes:null": 0,
+        ".tree_bytes:number": 0,
+        ".tree_bytes:str": 0,
+        ".tree_bytes:undef": 0,
         bool: false,
         number: 10,
         str: 'str',
@@ -1784,38 +1804,46 @@ describe("state-util", () => {
           ".version:number": "ver1",
           ".version:str": "ver1",
           ".version:undef": "ver1",
-          ".numParents": 1,
-          ".numParents:bool": 1,
-          ".numParents:empty_obj": 1,
-          ".numParents:empty_str": 1,
-          ".numParents:null": 1,
-          ".numParents:number": 1,
-          ".numParents:str": 1,
-          ".numParents:undef": 1,
-          ".proofHash": null,
-          ".proofHash:bool": null,
-          ".proofHash:empty_obj": null,
-          ".proofHash:empty_str": null,
-          ".proofHash:null": null,
-          ".proofHash:number": null,
-          ".proofHash:str": null,
-          ".proofHash:undef": null,
-          ".treeHeight": null,
-          ".treeHeight:bool": null,
-          ".treeHeight:empty_obj": null,
-          ".treeHeight:empty_str": null,
-          ".treeHeight:null": null,
-          ".treeHeight:number": null,
-          ".treeHeight:str": null,
-          ".treeHeight:undef": null,
-          ".treeSize": null,
-          ".treeSize:bool": null,
-          ".treeSize:empty_obj": null,
-          ".treeSize:empty_str": null,
-          ".treeSize:null": null,
-          ".treeSize:number": null,
-          ".treeSize:str": null,
-          ".treeSize:undef": null,
+          ".num_parents": 1,
+          ".num_parents:bool": 1,
+          ".num_parents:empty_obj": 1,
+          ".num_parents:empty_str": 1,
+          ".num_parents:null": 1,
+          ".num_parents:number": 1,
+          ".num_parents:str": 1,
+          ".num_parents:undef": 1,
+          ".proof_hash": null,
+          ".proof_hash:bool": null,
+          ".proof_hash:empty_obj": null,
+          ".proof_hash:empty_str": null,
+          ".proof_hash:null": null,
+          ".proof_hash:number": null,
+          ".proof_hash:str": null,
+          ".proof_hash:undef": null,
+          ".tree_height": 0,
+          ".tree_height:bool": 0,
+          ".tree_height:empty_obj": 0,
+          ".tree_height:empty_str": 0,
+          ".tree_height:null": 0,
+          ".tree_height:number": 0,
+          ".tree_height:str": 0,
+          ".tree_height:undef": 0,
+          ".tree_size": 0,
+          ".tree_size:bool": 0,
+          ".tree_size:empty_obj": 0,
+          ".tree_size:empty_str": 0,
+          ".tree_size:null": 0,
+          ".tree_size:number": 0,
+          ".tree_size:str": 0,
+          ".tree_size:undef": 0,
+          ".tree_bytes": 0,
+          ".tree_bytes:bool": 0,
+          ".tree_bytes:empty_obj": 0,
+          ".tree_bytes:empty_str": 0,
+          ".tree_bytes:null": 0,
+          ".tree_bytes:number": 0,
+          ".tree_bytes:str": 0,
+          ".tree_bytes:undef": 0,
           bool: true,
           number: 20,
           str: 'str2',
@@ -1833,38 +1861,46 @@ describe("state-util", () => {
           ".version:number": "ver1",
           ".version:str": "ver1",
           ".version:undef": "ver1",
-          ".numParents": 1,
-          ".numParents:bool": 1,
-          ".numParents:empty_obj": 1,
-          ".numParents:empty_str": 1,
-          ".numParents:null": 1,
-          ".numParents:number": 1,
-          ".numParents:str": 1,
-          ".numParents:undef": 1,
-          ".proofHash": null,
-          ".proofHash:bool": null,
-          ".proofHash:empty_obj": null,
-          ".proofHash:empty_str": null,
-          ".proofHash:null": null,
-          ".proofHash:number": null,
-          ".proofHash:str": null,
-          ".proofHash:undef": null,
-          ".treeHeight": null,
-          ".treeHeight:bool": null,
-          ".treeHeight:empty_obj": null,
-          ".treeHeight:empty_str": null,
-          ".treeHeight:null": null,
-          ".treeHeight:number": null,
-          ".treeHeight:str": null,
-          ".treeHeight:undef": null,
-          ".treeSize": null,
-          ".treeSize:bool": null,
-          ".treeSize:empty_obj": null,
-          ".treeSize:empty_str": null,
-          ".treeSize:null": null,
-          ".treeSize:number": null,
-          ".treeSize:str": null,
-          ".treeSize:undef": null,
+          ".num_parents": 1,
+          ".num_parents:bool": 1,
+          ".num_parents:empty_obj": 1,
+          ".num_parents:empty_str": 1,
+          ".num_parents:null": 1,
+          ".num_parents:number": 1,
+          ".num_parents:str": 1,
+          ".num_parents:undef": 1,
+          ".proof_hash": null,
+          ".proof_hash:bool": null,
+          ".proof_hash:empty_obj": null,
+          ".proof_hash:empty_str": null,
+          ".proof_hash:null": null,
+          ".proof_hash:number": null,
+          ".proof_hash:str": null,
+          ".proof_hash:undef": null,
+          ".tree_height": 0,
+          ".tree_height:bool": 0,
+          ".tree_height:empty_obj": 0,
+          ".tree_height:empty_str": 0,
+          ".tree_height:null": 0,
+          ".tree_height:number": 0,
+          ".tree_height:str": 0,
+          ".tree_height:undef": 0,
+          ".tree_size": 0,
+          ".tree_size:bool": 0,
+          ".tree_size:empty_obj": 0,
+          ".tree_size:empty_str": 0,
+          ".tree_size:null": 0,
+          ".tree_size:number": 0,
+          ".tree_size:str": 0,
+          ".tree_size:undef": 0,
+          ".tree_bytes": 0,
+          ".tree_bytes:bool": 0,
+          ".tree_bytes:empty_obj": 0,
+          ".tree_bytes:empty_str": 0,
+          ".tree_bytes:null": 0,
+          ".tree_bytes:number": 0,
+          ".tree_bytes:str": 0,
+          ".tree_bytes:undef": 0,
           bool: true,
           number: -10,
           str: 'str3',
@@ -1922,25 +1958,29 @@ describe("state-util", () => {
       const stateTree = new StateNode(ver3);
       stateTree.setChild('label1', child1);
       stateTree.setChild('label2', child2);
-      assert.deepEqual(stateTree.toJsObject(true), {
-        ".numParents": 0,
-        ".proofHash": null,
-        ".treeHeight": null,
-        ".treeSize": null,
+      assert.deepEqual(stateTree.toJsObject(GET_OPTIONS_INCLUDE_ALL), {
+        ".num_parents": 0,
+        ".proof_hash": null,
+        ".tree_height": 0,
+        ".tree_size": 0,
+        ".tree_bytes": 0,
         ".version": "ver3",
         "label1": {
-          ".numParents": 1,
-          ".numParents:label11": 1,
-          ".numParents:label12": 1,
-          ".proofHash": null,
-          ".proofHash:label11": null,
-          ".proofHash:label12": null,
-          ".treeHeight": null,
-          ".treeHeight:label11": null,
-          ".treeHeight:label12": null,
-          ".treeSize": null,
-          ".treeSize:label11": null,
-          ".treeSize:label12": null,
+          ".num_parents": 1,
+          ".num_parents:label11": 1,
+          ".num_parents:label12": 1,
+          ".proof_hash": null,
+          ".proof_hash:label11": null,
+          ".proof_hash:label12": null,
+          ".tree_height": 0,
+          ".tree_height:label11": 0,
+          ".tree_height:label12": 0,
+          ".tree_size": 0,
+          ".tree_size:label11": 0,
+          ".tree_size:label12": 0,
+          ".tree_bytes": 0,
+          ".tree_bytes:label11": 0,
+          ".tree_bytes:label12": 0,
           ".version": "ver2",
           ".version:label11": "ver1",
           ".version:label12": "ver2",
@@ -1948,18 +1988,21 @@ describe("state-util", () => {
           "label12": "value12",
         },
         "label2": {
-          ".numParents": 1,
-          ".numParents:label21": 1,
-          ".numParents:label22": 1,
-          ".proofHash": null,
-          ".proofHash:label21": null,
-          ".proofHash:label22": null,
-          ".treeHeight": null,
-          ".treeHeight:label21": null,
-          ".treeHeight:label22": null,
-          ".treeSize": null,
-          ".treeSize:label21": null,
-          ".treeSize:label22": null,
+          ".num_parents": 1,
+          ".num_parents:label21": 1,
+          ".num_parents:label22": 1,
+          ".proof_hash": null,
+          ".proof_hash:label21": null,
+          ".proof_hash:label22": null,
+          ".tree_height": 0,
+          ".tree_height:label21": 0,
+          ".tree_height:label22": 0,
+          ".tree_size": 0,
+          ".tree_size:label21": 0,
+          ".tree_size:label22": 0,
+          ".tree_bytes": 0,
+          ".tree_bytes:label21": 0,
+          ".tree_bytes:label22": 0,
           ".version": "ver2",
           ".version:label21": "ver2",
           ".version:label22": "ver1",
@@ -1970,25 +2013,29 @@ describe("state-util", () => {
 
       const numNodes = renameStateTreeVersion(stateTree, ver2, ver3);
       expect(numNodes).to.equal(4);
-      assert.deepEqual(stateTree.toJsObject(true), {
-        ".numParents": 0,
-        ".proofHash": null,
-        ".treeHeight": null,
-        ".treeSize": null,
+      assert.deepEqual(stateTree.toJsObject(GET_OPTIONS_INCLUDE_ALL), {
+        ".num_parents": 0,
+        ".proof_hash": null,
+        ".tree_height": 0,
+        ".tree_size": 0,
+        ".tree_bytes": 0,
         ".version": "ver3",
         "label1": {
-          ".numParents": 1,
-          ".numParents:label11": 1,
-          ".numParents:label12": 1,
-          ".proofHash": null,
-          ".proofHash:label11": null,
-          ".proofHash:label12": null,
-          ".treeHeight": null,
-          ".treeHeight:label11": null,
-          ".treeHeight:label12": null,
-          ".treeSize": null,
-          ".treeSize:label11": null,
-          ".treeSize:label12": null,
+          ".num_parents": 1,
+          ".num_parents:label11": 1,
+          ".num_parents:label12": 1,
+          ".proof_hash": null,
+          ".proof_hash:label11": null,
+          ".proof_hash:label12": null,
+          ".tree_height": 0,
+          ".tree_height:label11": 0,
+          ".tree_height:label12": 0,
+          ".tree_size": 0,
+          ".tree_size:label11": 0,
+          ".tree_size:label12": 0,
+          ".tree_bytes": 0,
+          ".tree_bytes:label11": 0,
+          ".tree_bytes:label12": 0,
           ".version": "ver3",  // renamed
           ".version:label11": "ver1",
           ".version:label12": "ver3",  // renamed
@@ -1996,18 +2043,21 @@ describe("state-util", () => {
           "label12": "value12",
         },
         "label2": {
-          ".numParents": 1,
-          ".numParents:label21": 1,
-          ".numParents:label22": 1,
-          ".proofHash": null,
-          ".proofHash:label21": null,
-          ".proofHash:label22": null,
-          ".treeHeight": null,
-          ".treeHeight:label21": null,
-          ".treeHeight:label22": null,
-          ".treeSize": null,
-          ".treeSize:label21": null,
-          ".treeSize:label22": null,
+          ".num_parents": 1,
+          ".num_parents:label21": 1,
+          ".num_parents:label22": 1,
+          ".proof_hash": null,
+          ".proof_hash:label21": null,
+          ".proof_hash:label22": null,
+          ".tree_height": 0,
+          ".tree_height:label21": 0,
+          ".tree_height:label22": 0,
+          ".tree_size": 0,
+          ".tree_size:label21": 0,
+          ".tree_size:label22": 0,
+          ".tree_bytes": 0,
+          ".tree_bytes:label21": 0,
+          ".tree_bytes:label22": 0,
           ".version": "ver3",  // renamed
           ".version:label21": "ver3",  // renamed
           ".version:label22": "ver1",
@@ -2066,7 +2116,7 @@ describe("state-util", () => {
       const numNodes = deleteStateTree(stateTree);
       expect(numNodes).to.equal(3);
       // State tree is deleted.
-      assert.deepEqual(stateTree.toJsObject(true), null);
+      assert.deepEqual(stateTree.toJsObject(GET_OPTIONS_INCLUDE_ALL), null);
       // And child nodes are deleted as well.
       expect(child1.getValue()).to.equal(null);
       expect(child1.getProofHash()).to.equal(null);
@@ -2143,7 +2193,7 @@ describe("state-util", () => {
       const numNodes = deleteStateTreeVersion(node);
       expect(numNodes).to.equal(3);
       // State tree is deleted.
-      assert.deepEqual(node.toJsObject(true), null);
+      assert.deepEqual(node.toJsObject(GET_OPTIONS_INCLUDE_ALL), null);
       // And child nodes are deleted as well.
       expect(child1.getValue()).to.equal(null);
       expect(child1.getProofHash()).to.equal(null);
@@ -2162,7 +2212,7 @@ describe("state-util", () => {
       const numNodes = deleteStateTreeVersion(node);
       expect(numNodes).to.equal(3);
       // State tree is deleted.
-      assert.deepEqual(node.toJsObject(true), null);
+      assert.deepEqual(node.toJsObject(GET_OPTIONS_INCLUDE_ALL), null);
       // And child nodes are deleted as well.
       expect(child1.getValue()).to.equal(null);
       expect(child1.getProofHash()).to.equal(null);
@@ -2181,22 +2231,25 @@ describe("state-util", () => {
       const numNodes = deleteStateTreeVersion(node);
       expect(numNodes).to.equal(0);
       // State tree is not deleted.
-      assert.deepEqual(node.toJsObject(true), {
+      assert.deepEqual(node.toJsObject(GET_OPTIONS_INCLUDE_ALL), {
         ".version": "ver3",
         ".version:label1": "ver1",
         ".version:label2": "ver2",
-        ".numParents": 1,
-        ".numParents:label1": 1,
-        ".numParents:label2": 1,
-        ".proofHash": "0xa540d9d1906f4579604302acdee0b4c9742f537eb5f8397fb9a43ed458dad439",
-        ".proofHash:label1": "0xb41f4a6e100333ddd8e8dcc01ca1fed23662d9faaec359ed255d21a900cecd08",
-        ".proofHash:label2": "0x7597bdc763c23c44e90f26c63d7eac963cc0d0aa8a0a3268e7f5691c5361d942",
-        ".treeHeight": 1,
-        ".treeHeight:label1": 0,
-        ".treeHeight:label2": 0,
-        ".treeSize": 3,
-        ".treeSize:label1": 1,
-        ".treeSize:label2": 1,
+        ".num_parents": 1,
+        ".num_parents:label1": 1,
+        ".num_parents:label2": 1,
+        ".proof_hash": "0xa540d9d1906f4579604302acdee0b4c9742f537eb5f8397fb9a43ed458dad439",
+        ".proof_hash:label1": "0xb41f4a6e100333ddd8e8dcc01ca1fed23662d9faaec359ed255d21a900cecd08",
+        ".proof_hash:label2": "0x7597bdc763c23c44e90f26c63d7eac963cc0d0aa8a0a3268e7f5691c5361d942",
+        ".tree_height": 1,
+        ".tree_height:label1": 0,
+        ".tree_height:label2": 0,
+        ".tree_size": 3,
+        ".tree_size:label1": 1,
+        ".tree_size:label2": 1,
+        ".tree_bytes": 528,
+        ".tree_bytes:label1": 172,
+        ".tree_bytes:label2": 172,
         label1: "value1",
         label2: "value2"
       });
@@ -2206,7 +2259,7 @@ describe("state-util", () => {
       const numNodes = deleteStateTreeVersion(node);
       expect(numNodes).to.equal(3);
       // Root node is deleted.
-      assert.deepEqual(node.toJsObject(true), null);
+      assert.deepEqual(node.toJsObject(GET_OPTIONS_INCLUDE_ALL), null);
       // And child nodes are deleted as well.
       expect(child1.getValue()).to.equal(null);
       expect(child1.getProofHash()).to.equal(null);
@@ -2230,7 +2283,7 @@ describe("state-util", () => {
       const numNodes = deleteStateTreeVersion(node);
       expect(numNodes).to.equal(1);
       // State tree is deleted.
-      assert.deepEqual(node.toJsObject(true), null);
+      assert.deepEqual(node.toJsObject(GET_OPTIONS_INCLUDE_ALL), null);
       // But child nodes are not deleted.
       expect(child1.getValue()).to.equal('value1');
       expect(child1.getProofHash()).to.not.equal(null);
@@ -2463,15 +2516,22 @@ describe("state-util", () => {
       expect(bazNode.getTreeHeight()).to.equal(0);
       expect(level1Node.getTreeHeight()).to.equal(1);
       expect(level0Node.getTreeHeight()).to.equal(2);
-      expect(anotherNode.getTreeHeight()).to.equal(null);
-      expect(testNode.getTreeHeight()).to.equal(null);
+      expect(anotherNode.getTreeHeight()).to.equal(0);
+      expect(testNode.getTreeHeight()).to.equal(0);
       // Checks tree sizes.
       expect(fooNode.getTreeSize()).to.equal(1);
       expect(bazNode.getTreeSize()).to.equal(1);
       expect(level1Node.getTreeSize()).to.equal(3);
       expect(level0Node.getTreeSize()).to.equal(4);
-      expect(anotherNode.getTreeSize()).to.equal(null);
-      expect(testNode.getTreeSize()).to.equal(null);
+      expect(anotherNode.getTreeSize()).to.equal(0);
+      expect(testNode.getTreeSize()).to.equal(0);
+      // Checks tree bytes.
+      expect(fooNode.getTreeBytes()).to.equal(166);
+      expect(bazNode.getTreeBytes()).to.equal(166);
+      expect(level1Node.getTreeBytes()).to.equal(504);
+      expect(level0Node.getTreeBytes()).to.equal(676);
+      expect(anotherNode.getTreeBytes()).to.equal(0);
+      expect(testNode.getTreeBytes()).to.equal(0);
     });
   });
 
@@ -2496,6 +2556,13 @@ describe("state-util", () => {
       const level2Node = level1Node.getChild('level2');
       const anotherNode = level0Node.getChild('another_route');
 
+      level2Node.setTreeHeight(1);
+      level2Node.setTreeSize(3);
+      level2Node.setTreeBytes(150);  // An arbitrary value
+      anotherNode.setTreeHeight(1);
+      anotherNode.setTreeSize(2);
+      anotherNode.setTreeBytes(100);  // An arbitrary value
+
       const numAffectedNodes = updateProofHashForAllRootPaths(['level0', 'level1'], rootNode);
       expect(numAffectedNodes).to.equal(3);
       // Checks proof hashes.
@@ -2508,13 +2575,17 @@ describe("state-util", () => {
       expect(level0Node.getProofHash()).to.equal(level0Node.buildProofHash());
       expect(rootNode.getProofHash()).to.equal(rootNode.buildProofHash());
       // Checks tree heights.
-      expect(level1Node.getTreeHeight()).to.equal(1);
-      expect(level0Node.getTreeHeight()).to.equal(2);
-      expect(rootNode.getTreeHeight()).to.equal(3);
+      expect(level1Node.getTreeHeight()).to.equal(2);
+      expect(level0Node.getTreeHeight()).to.equal(3);
+      expect(rootNode.getTreeHeight()).to.equal(4);
       // Checks tree sizes.
-      expect(level1Node.getTreeSize()).to.equal(1);
-      expect(level0Node.getTreeSize()).to.equal(2);
-      expect(rootNode.getTreeSize()).to.equal(3);
+      expect(level1Node.getTreeSize()).to.equal(4);
+      expect(level0Node.getTreeSize()).to.equal(7);
+      expect(rootNode.getTreeSize()).to.equal(8);
+      // Checks tree bytes.
+      expect(level1Node.getTreeBytes()).to.equal(322);
+      expect(level0Node.getTreeBytes()).to.equal(620);
+      expect(rootNode.getTreeBytes()).to.equal(792);
     });
 
     it("updates proof hashes for multiple root paths", () => {
diff --git a/unittest/test-util.js b/unittest/test-util.js
index d16877314..336362878 100644
--- a/unittest/test-util.js
+++ b/unittest/test-util.js
@@ -2,9 +2,16 @@ const path = require('path');
 const fs = require("fs");
 const syncRequest = require('sync-request');
 const { Block } = require('../blockchain/block');
+const DB = require('../db');
 const { CURRENT_PROTOCOL_VERSION, StateVersions } = require('../common/constants');
 const CommonUtil = require('../common/common-util');
 
+const GET_OPTIONS_INCLUDE_ALL = {
+  includeTreeInfo: true,
+  includeProof: true,
+  includeVersion: true,
+};
+
 function readConfigFile(filePath) {
   if (!fs.existsSync(filePath)) {
     throw Error('Missing config file: ' + filePath);
@@ -24,21 +31,21 @@ function setNodeForTesting(
       throw Error('Missing owners file: ' + ownersFile);
     }
     const owners = readConfigFile(ownersFile);
-    node.db.setOwnersForTesting("test", owners);
+    node.db.setOwnersForTesting("/apps/test", owners);
 
     const rulesFile = path.resolve(__dirname, './data/rules_for_testing.json');
     if (!fs.existsSync(rulesFile)) {
       throw Error('Missing rules file: ' + rulesFile);
     }
     const rules = readConfigFile(rulesFile);
-    node.db.setRulesForTesting("test", rules);
+    node.db.setRulesForTesting("/apps/test", rules);
 
     const functionsFile = path.resolve(__dirname, './data/functions_for_testing.json');
     if (!fs.existsSync(functionsFile)) {
       throw Error('Missing functions file: ' + functionsFile);
     }
     const functions = JSON.parse(fs.readFileSync(functionsFile));
-    node.db.setFunctionsForTesting("test", functions);
+    node.db.setFunctionsForTesting("/apps/test", functions);
   }
   if (!skipShardingConfig) {
     const shardingFile = path.resolve(__dirname, './data/sharding_for_testing.json');
@@ -57,10 +64,11 @@ function getTransaction(node, inputTxBody) {
 
 function addBlock(node, txs, votes, validators) {
   const lastBlock = node.bc.lastBlock();
-  const finalDb = node.createDb(node.stateManager.getFinalVersion(),
-      `${StateVersions.FINAL}:${lastBlock.number + 1}`, node.bc, node.tp, true);
-  finalDb.executeTransactionList(votes);
-  finalDb.executeTransactionList(txs, lastBlock.number + 1);
+  const finalDb = DB.create(
+      node.stateManager.getFinalVersion(), `${StateVersions.FINAL}:${lastBlock.number + 1}`,
+      node.bc, node.tp, true, false, lastBlock.number, node.stateManager);
+  finalDb.executeTransactionList(votes, true);
+  finalDb.executeTransactionList(txs, false, true, lastBlock.number + 1);
   node.syncDbAndNonce(`${StateVersions.NODE}:${lastBlock.number + 1}`);
   node.addNewBlock(Block.create(
       lastBlock.hash, votes, txs, lastBlock.number + 1, lastBlock.epoch + 1, '',
@@ -87,20 +95,17 @@ async function waitUntilTxFinalized(servers, txHash) {
         unchecked.delete(server);
       }
     }
-    await CommonUtil.sleep(200);
+    await CommonUtil.sleep(500);
     iterCount++;
   }
 }
 
 async function waitForNewBlocks(server, waitFor = 1) {
-  const initialLastBlockNumber =
-      parseOrLog(syncRequest('GET', server + '/last_block_number')
-        .body.toString('utf-8'))['result'];
+  const initialLastBlockNumber = getLastBlockNumber(server);
   let updatedLastBlockNumber = initialLastBlockNumber;
   while (updatedLastBlockNumber < initialLastBlockNumber + waitFor) {
     await CommonUtil.sleep(1000);
-    updatedLastBlockNumber = parseOrLog(syncRequest('GET', server + '/last_block_number')
-      .body.toString('utf-8'))['result'];
+    updatedLastBlockNumber = getLastBlockNumber(server);
   }
 }
 
@@ -123,7 +128,45 @@ function parseOrLog(resp) {
   return parsed;
 }
 
+async function setUpApp(appName, serverList, appConfig) {
+  const signingAddr = parseOrLog(syncRequest(
+    'GET', serverList[0] + '/get_address').body.toString('utf-8')).result;
+  const appStakingRes = parseOrLog(syncRequest('POST', serverList[0] + '/set_value', {
+    json: {
+      ref: `/staking/${appName}/${signingAddr}/0/stake/${Date.now()}/value`,
+      value: 1
+    }
+  }).body.toString('utf-8')).result;
+  if (!(await waitUntilTxFinalized(serverList, appStakingRes.tx_hash))) {
+    console.log(`setUpApp(): Failed to check finalization of app staking tx.`);
+  }
+
+  const createAppRes = parseOrLog(syncRequest('POST', serverList[0] + '/set_value', {
+    json: {
+      ref: `/manage_app/${appName}/create/${Date.now()}`,
+      value: appConfig
+    }
+  }).body.toString('utf-8')).result;
+  if (!(await waitUntilTxFinalized(serverList, createAppRes.tx_hash))) {
+    console.log(`setUpApp(): Failed to check finalization of create app tx.`)
+  }
+}
+
+function getLastBlock(server) {
+  return parseOrLog(syncRequest('GET', server + '/last_block').body.toString('utf-8')).result;
+}
+
+function getLastBlockNumber(server) {
+  return parseOrLog(syncRequest('GET', server + '/last_block_number').body.toString('utf-8')).result;
+}
+
+function getBlockByNumber(server, number) {
+  return parseOrLog(syncRequest('GET', server + `/get_block_by_number?number=${number}`)
+      .body.toString('utf-8')).result;
+}
+
 module.exports = {
+  GET_OPTIONS_INCLUDE_ALL,
   readConfigFile,
   setNodeForTesting,
   getTransaction,
@@ -132,4 +175,8 @@ module.exports = {
   waitForNewBlocks,
   waitUntilNodeSyncs,
   parseOrLog,
+  setUpApp,
+  getLastBlock,
+  getLastBlockNumber,
+  getBlockByNumber,
 };
diff --git a/unittest/transaction.test.js b/unittest/transaction.test.js
index 3332f82d9..a0f7bbd4d 100644
--- a/unittest/transaction.test.js
+++ b/unittest/transaction.test.js
@@ -4,6 +4,7 @@ const assert = chai.assert;
 const expect = chai.expect;
 const {
   CHAINS_DIR,
+  PredefinedDbPaths,
 } = require('../common/constants');
 const Transaction = require('../tx-pool/transaction');
 const BlockchainNode = require('../node/');
@@ -28,6 +29,14 @@ describe('Transaction', () => {
 
     node = new BlockchainNode();
     setNodeForTesting(node);
+    node.db.writeDatabase(
+      [PredefinedDbPaths.VALUES_ROOT, PredefinedDbPaths.STAKING, 'app_a', PredefinedDbPaths.STAKING_BALANCE_TOTAL],
+      1
+    );
+    node.db.writeDatabase(
+      [PredefinedDbPaths.VALUES_ROOT, PredefinedDbPaths.STAKING, 'test', PredefinedDbPaths.STAKING_BALANCE_TOTAL],
+      1
+    );
 
     txBody = {
       operation: {
@@ -83,7 +92,7 @@ describe('Transaction', () => {
     txBodyForNode = {
       operation: {
         type: 'SET_VALUE',
-        ref: 'test/comcom',
+        ref: '/apps/test/comcom',
         value: 'val'
       },
       gas_price: 1
@@ -210,10 +219,12 @@ describe('Transaction', () => {
   describe('extra', () => {
     const gas = {
       gas_amount: {
-        service: 100,
-        app: {
-          app1: 50,
-          app2: 20
+        bandwidth: {
+          service: 100,
+          app: {
+            app1: 50,
+            app2: 20
+          }
         }
       }
     };
@@ -251,10 +262,10 @@ describe('Transaction', () => {
     it('assigns nonces correctly', async () => {
       let tx2;
       let currentNonce;
-      for (currentNonce = node.nonce - 1; currentNonce < 50; currentNonce++) {
+      for (currentNonce = node.getNonce() - 1; currentNonce < 50; currentNonce++) {
         delete txBodyForNode.nonce;
         tx2 = getTransaction(node, txBodyForNode);
-        node.db.executeTransaction(tx2, node.bc.lastBlockNumber() + 1);
+        node.db.executeTransaction(tx2, false, true, node.bc.lastBlockNumber() + 1);
         await CommonUtil.sleep(1);
       }
       expect(tx2).to.not.equal(null);
diff --git a/unittest/tx-pool.test.js b/unittest/tx-pool.test.js
index 860ebb4b2..eba5dc392 100644
--- a/unittest/tx-pool.test.js
+++ b/unittest/tx-pool.test.js
@@ -7,6 +7,13 @@ const {Block} = require('../blockchain/block');
 const BlockchainNode = require('../node');
 const {setNodeForTesting, getTransaction} = require('./test-util');
 const TransactionPool = require('../tx-pool');
+const {
+  BANDWIDTH_BUDGET_PER_BLOCK,
+  SERVICE_BANDWIDTH_BUDGET_PER_BLOCK,
+  APPS_BANDWIDTH_BUDGET_PER_BLOCK,
+  FREE_BANDWIDTH_BUDGET_PER_BLOCK,
+  TransactionStates,
+} = require('../common/constants');
 
 describe('TransactionPool', async () => {
   let node, transaction;
@@ -20,7 +27,7 @@ describe('TransactionPool', async () => {
         ref: 'REF',
         value: 'VALUE'
       },
-      nonce: node.nonce++,
+      nonce: node.getNonce(),
       gas_price: 1
     });
     node.tp.addTransaction(transaction);
@@ -28,9 +35,36 @@ describe('TransactionPool', async () => {
   });
 
   describe('Transaction addition', () => {
-    it('addTransaction()', () => {
-      expect(node.tp.transactions[node.account.address].find((t) => t.hash === transaction.hash))
-          .to.equal(transaction);
+    let initialNonce = node.getNonce();
+    let txToAdd;
+
+    beforeEach(async () => {
+      txToAdd = getTransaction(node, {
+        operation: {
+          type: 'SET_VALUE',
+          ref: 'REF',
+          value: 'VALUE'
+        },
+        nonce: initialNonce++,
+        gas_price: 1
+      });
+    });
+
+    it('add a pending transaction', () => {
+      node.tp.addTransaction(txToAdd);
+      expect(node.tp.transactions[node.account.address].find((t) => t.hash === txToAdd.hash))
+          .to.equal(txToAdd);
+      const txInfo = node.getTransactionByHash(txToAdd.hash);
+      expect(txInfo.state).to.equal(TransactionStates.PENDING);
+    });
+
+    it('add an executed transaction', () => {
+      node.tp.addTransaction(txToAdd, true);
+
+      expect(node.tp.transactions[node.account.address].find((t) => t.hash === txToAdd.hash))
+          .to.equal(txToAdd);
+      const txInfo = node.getTransactionByHash(txToAdd.hash);
+      expect(txInfo.state).to.equal(TransactionStates.EXECUTED);
     });
   });
 
@@ -38,6 +72,7 @@ describe('TransactionPool', async () => {
     let node2; let node3; let node4;
 
     beforeEach(async () => {
+      let initialNonce = node.getNonce();
       for (let i = 0; i < 10; i++) {
         const tx = getTransaction(node, {
           operation: {
@@ -45,7 +80,7 @@ describe('TransactionPool', async () => {
             ref: 'REF',
             value: 'VALUE',
           },
-          nonce: node.nonce++,
+          nonce: initialNonce++,
           gas_price: 1
         });
         node.tp.addTransaction(tx);
@@ -64,14 +99,16 @@ describe('TransactionPool', async () => {
       setNodeForTesting(node4, 3);
       const nodes = [node2, node3, node4];
       for (let j = 0; j < nodes.length; j++) {
+        const curNode = nodes[j];
+        let initialNonce = curNode.getNonce();
         for (let i = 0; i < 11; i++) {
-          const tx = getTransaction(nodes[j], {
+          const tx = getTransaction(curNode, {
             operation: {
               type: 'SET_VALUE',
               ref: 'REF',
               value: 'VALUE',
             },
-            nonce: nodes[j].nonce++,
+            nonce: initialNonce++,
             gas_price: 1
           });
           node.tp.addTransaction(tx);
@@ -128,61 +165,61 @@ describe('TransactionPool', async () => {
         assert.deepEqual(
           TransactionPool.mergeTwoSortedArrays(
             [], 
-            [{tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {service: 1}}}]
+            [{tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {service: 1}}}}]
           ),
-          [{tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {service: 1}}}]);
+          [{tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {service: 1}}}}]);
         assert.deepEqual(
           TransactionPool.mergeTwoSortedArrays(
-            [{tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {service: 1}}}],
-            [{tx_body: {timestamp: 2, gas_price: 2}, extra: {gas: {service: 1}}}]
+            [{tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {service: 1}}}}],
+            [{tx_body: {timestamp: 2, gas_price: 2}, extra: {gas: {bandwidth: {service: 1}}}}]
           ),
           [
-            {tx_body: {timestamp: 2, gas_price: 2}, extra: {gas: {service: 1}}},
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {service: 1}}}
+            {tx_body: {timestamp: 2, gas_price: 2}, extra: {gas: {bandwidth: {service: 1}}}},
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {service: 1}}}}
           ]);
         assert.deepEqual(
           TransactionPool.mergeTwoSortedArrays(
-            [{tx_body: {timestamp: 1, gas_price: 2}, extra: {gas: {service: 1}}}],
-            [{tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {service: 1}}}]
+            [{tx_body: {timestamp: 1, gas_price: 2}, extra: {gas: {bandwidth: {service: 1}}}}],
+            [{tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {bandwidth: {service: 1}}}}]
           ),
           [
-            {tx_body: {timestamp: 1, gas_price: 2}, extra: {gas: {service: 1}}},
-            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {service: 1}}}
+            {tx_body: {timestamp: 1, gas_price: 2}, extra: {gas: {bandwidth: {service: 1}}}},
+            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {bandwidth: {service: 1}}}}
           ]);
         assert.deepEqual(
           TransactionPool.mergeTwoSortedArrays(
-            [{tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {service: 1}}}],
-            [{tx_body: {timestamp: 1, gas_price: 2}, extra: {gas: {service: 1}}}]
+            [{tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {bandwidth: {service: 1}}}}],
+            [{tx_body: {timestamp: 1, gas_price: 2}, extra: {gas: {bandwidth: {service: 1}}}}]
           ),
           [
-            {tx_body: {timestamp: 1, gas_price: 2}, extra: {gas: {service: 1}}},
-            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {service: 1}}}
+            {tx_body: {timestamp: 1, gas_price: 2}, extra: {gas: {bandwidth: {service: 1}}}},
+            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {bandwidth: {service: 1}}}}
           ]);
         assert.deepEqual(
           TransactionPool.mergeTwoSortedArrays(
             [
-              {tx_body: {timestamp: 1, gas_price: 2}, extra: {gas: {service: 1}}},
-              {tx_body: {timestamp: 2, gas_price: 3}, extra: {gas: {service: 1}}}
+              {tx_body: {timestamp: 1, gas_price: 2}, extra: {gas: {bandwidth: {service: 1}}}},
+              {tx_body: {timestamp: 2, gas_price: 3}, extra: {gas: {bandwidth: {service: 1}}}}
             ],
-            [{tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {service: 1}}}]
+            [{tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {bandwidth: {service: 1}}}}]
           ),
           [
-            {tx_body: {timestamp: 1, gas_price: 2}, extra: {gas: {service: 1}}},
-            {tx_body: {timestamp: 2, gas_price: 3}, extra: {gas: {service: 1}}},
-            {tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {service: 1}}}
+            {tx_body: {timestamp: 1, gas_price: 2}, extra: {gas: {bandwidth: {service: 1}}}},
+            {tx_body: {timestamp: 2, gas_price: 3}, extra: {gas: {bandwidth: {service: 1}}}},
+            {tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {bandwidth: {service: 1}}}}
           ]);
         assert.deepEqual(
           TransactionPool.mergeTwoSortedArrays(
             [
-              {tx_body: {timestamp: 1, gas_price: 2}, extra: {gas: {service: 1}}},
-              {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {service: 1}}}
+              {tx_body: {timestamp: 1, gas_price: 2}, extra: {gas: {bandwidth: {service: 1}}}},
+              {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {bandwidth: {service: 1}}}}
             ],
-            [{tx_body: {timestamp: 3, gas_price: 3}, extra: {gas: {service: 1}}}]
+            [{tx_body: {timestamp: 3, gas_price: 3}, extra: {gas: {bandwidth: {service: 1}}}}]
           ),
           [
-            {tx_body: {timestamp: 3, gas_price: 3}, extra: {gas: {service: 1}}},
-            {tx_body: {timestamp: 1, gas_price: 2}, extra: {gas: {service: 1}}},
-            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {service: 1}}}
+            {tx_body: {timestamp: 3, gas_price: 3}, extra: {gas: {bandwidth: {service: 1}}}},
+            {tx_body: {timestamp: 1, gas_price: 2}, extra: {gas: {bandwidth: {service: 1}}}},
+            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {bandwidth: {service: 1}}}}
           ]);
       });
 
@@ -190,90 +227,90 @@ describe('TransactionPool', async () => {
         assert.deepEqual(
           TransactionPool.mergeTwoSortedArrays(
             [], 
-            [{tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}]
+            [{tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}]
           ),
-          [{tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}]);
+          [{tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}]);
         assert.deepEqual(
           TransactionPool.mergeTwoSortedArrays(
-            [{tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}],
-            [{tx_body: {timestamp: 2, gas_price: 2}, extra: {gas: {app: {app1: 1}}}}]
+            [{tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}],
+            [{tx_body: {timestamp: 2, gas_price: 2}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}]
           ),
           [
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-            {tx_body: {timestamp: 2, gas_price: 2}, extra: {gas: {app: {app1: 1}}}}
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+            {tx_body: {timestamp: 2, gas_price: 2}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}
           ]);
         assert.deepEqual(
           TransactionPool.mergeTwoSortedArrays(
-            [{tx_body: {timestamp: 2, gas_price: 2}, extra: {gas: {app: {app1: 1}}}}],
-            [{tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}]
+            [{tx_body: {timestamp: 2, gas_price: 2}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}],
+            [{tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}]
           ),
           [
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-            {tx_body: {timestamp: 2, gas_price: 2}, extra: {gas: {app: {app1: 1}}}}
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+            {tx_body: {timestamp: 2, gas_price: 2}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}
           ]);
         assert.deepEqual(
           TransactionPool.mergeTwoSortedArrays(
             [
-              {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-              {tx_body: {timestamp: 3, gas_price: 2}, extra: {gas: {app: {app1: 1}}}}
+              {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+              {tx_body: {timestamp: 3, gas_price: 2}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}
             ], 
-            [{tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}]
+            [{tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}]
           ),
           [
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-            {tx_body: {timestamp: 3, gas_price: 2}, extra: {gas: {app: {app1: 1}}}}
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+            {tx_body: {timestamp: 3, gas_price: 2}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}
           ]);
       });
 
       it('with service & app txs', () => {
         assert.deepEqual(
           TransactionPool.mergeTwoSortedArrays(
-            [{tx_body: {timestamp: 1, gas_price: 2}, extra: {gas: {app: {app1: 1}}}}],
-            [{tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {service: 1}}}]
+            [{tx_body: {timestamp: 1, gas_price: 2}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}],
+            [{tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {bandwidth: {service: 1}}}}]
           ),
           [
-            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {service: 1}}},
-            {tx_body: {timestamp: 1, gas_price: 2}, extra: {gas: {app: {app1: 1}}}}
+            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {bandwidth: {service: 1}}}},
+            {tx_body: {timestamp: 1, gas_price: 2}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}
           ]);
         assert.deepEqual(
           TransactionPool.mergeTwoSortedArrays(
             [
-              {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-              {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {service: 1}}}
+              {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+              {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {bandwidth: {service: 1}}}}
             ],
-            [{tx_body: {timestamp: 1, gas_price: 2}, extra: {gas: {service: 1}}}]
+            [{tx_body: {timestamp: 1, gas_price: 2}, extra: {gas: {bandwidth: {service: 1}}}}]
           ),
           [
-            {tx_body: {timestamp: 1, gas_price: 2}, extra: {gas: {service: 1}}},
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {service: 1}}}
+            {tx_body: {timestamp: 1, gas_price: 2}, extra: {gas: {bandwidth: {service: 1}}}},
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {bandwidth: {service: 1}}}}
           ]);
         assert.deepEqual(
           TransactionPool.mergeTwoSortedArrays(
             [
-              {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {service: 1}}},
-              {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}
+              {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {service: 1}}}},
+              {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}
             ],
-            [{tx_body: {timestamp: 1, gas_price: 2}, extra: {gas: {service: 1}}}]
+            [{tx_body: {timestamp: 1, gas_price: 2}, extra: {gas: {bandwidth: {service: 1}}}}]
           ),
           [
-            {tx_body: {timestamp: 1, gas_price: 2}, extra: {gas: {service: 1}}},
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {service: 1}}},
-            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}
+            {tx_body: {timestamp: 1, gas_price: 2}, extra: {gas: {bandwidth: {service: 1}}}},
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {service: 1}}}},
+            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}
           ]);
         assert.deepEqual(
           TransactionPool.mergeTwoSortedArrays(
             [
-              {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {service: 1}}},
-              {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}
+              {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {service: 1}}}},
+              {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}
             ],
-            [{tx_body: {timestamp: 1, gas_price: 2}, extra: {gas: {service: 1, app: {app1: 1}}}}]
+            [{tx_body: {timestamp: 1, gas_price: 2}, extra: {gas: {bandwidth: {service: 1, app: {app1: 1}}}}}]
           ),
           [
-            {tx_body: {timestamp: 1, gas_price: 2}, extra: {gas: {service: 1, app: {app1: 1}}}},
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {service: 1}}},
-            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}
+            {tx_body: {timestamp: 1, gas_price: 2}, extra: {gas: {bandwidth: {service: 1, app: {app1: 1}}}}},
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {service: 1}}}},
+            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}
           ]);
       });
     });
@@ -285,26 +322,26 @@ describe('TransactionPool', async () => {
         assert.deepEqual(
           TransactionPool.mergeMultipleSortedArrays(
             [
-              [{tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {service: 1}}}],
+              [{tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {service: 1}}}}],
               []
             ]
           ),
-          [{tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {service: 1}}}]);
+          [{tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {service: 1}}}}]);
       });
 
       it('with service txs', () => {
         assert.deepEqual(
           TransactionPool.mergeMultipleSortedArrays(
             [
-                [{tx_body: {timestamp: 1, gas_price: 3}, extra: {gas: {service: 1}}}],
-                [{tx_body: {timestamp: 2, gas_price: 2}, extra: {gas: {service: 1}}}],
-                [{tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {service: 1}}}]
+                [{tx_body: {timestamp: 1, gas_price: 3}, extra: {gas: {bandwidth: {service: 1}}}}],
+                [{tx_body: {timestamp: 2, gas_price: 2}, extra: {gas: {bandwidth: {service: 1}}}}],
+                [{tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {bandwidth: {service: 1}}}}]
             ]
           ),
           [
-            {tx_body: {timestamp: 1, gas_price: 3}, extra: {gas: {service: 1}}},
-            {tx_body: {timestamp: 2, gas_price: 2}, extra: {gas: {service: 1}}},
-            {tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {service: 1}}}
+            {tx_body: {timestamp: 1, gas_price: 3}, extra: {gas: {bandwidth: {service: 1}}}},
+            {tx_body: {timestamp: 2, gas_price: 2}, extra: {gas: {bandwidth: {service: 1}}}},
+            {tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {bandwidth: {service: 1}}}}
           ]);
       });
 
@@ -312,93 +349,93 @@ describe('TransactionPool', async () => {
         assert.deepEqual(
           TransactionPool.mergeMultipleSortedArrays(
             [
-              [{tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}],
-              [{tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}],
-              [{tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}]
+              [{tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}],
+              [{tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}],
+              [{tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}]
             ]
           ),
           [
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-            {tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+            {tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}
           ]);
         assert.deepEqual(
           TransactionPool.mergeMultipleSortedArrays(
             [
-              [{tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}],
+              [{tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}],
               [
-                {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-                {tx_body: {timestamp: 4, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}
+                {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+                {tx_body: {timestamp: 4, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}
               ],
-              [{tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}]
+              [{tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}]
             ]
           ),
           [
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-            {tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-            {tx_body: {timestamp: 4, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+            {tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+            {tx_body: {timestamp: 4, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}
           ]);
         assert.deepEqual(
           TransactionPool.mergeMultipleSortedArrays(
             [
-              [{tx_body: {timestamp: 4, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}],
-              [{tx_body: {timestamp: 5, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}],
+              [{tx_body: {timestamp: 4, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}],
+              [{tx_body: {timestamp: 5, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}],
               [
-                {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-                {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-                {tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}
+                {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+                {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+                {tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}
               ]
             ]
           ),
           [
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-            {tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-            {tx_body: {timestamp: 4, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-            {tx_body: {timestamp: 5, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+            {tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+            {tx_body: {timestamp: 4, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+            {tx_body: {timestamp: 5, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}
           ]);
         assert.deepEqual(
           TransactionPool.mergeMultipleSortedArrays(
             [
-              [{tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}],
-              [{tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}],
+              [{tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}],
+              [{tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}],
               [
-                {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-                {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-                {tx_body: {timestamp: 4, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}
+                {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+                {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+                {tx_body: {timestamp: 4, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}
               ]
             ]
           ),
           [
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-            {tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-            {tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-            {tx_body: {timestamp: 4, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+            {tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+            {tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+            {tx_body: {timestamp: 4, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}
           ]);
         assert.deepEqual(
           TransactionPool.mergeMultipleSortedArrays(
             [
-              [{tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}],
+              [{tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}],
               [
-                {tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-                {tx_body: {timestamp: 5, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}
+                {tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+                {tx_body: {timestamp: 5, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}
               ],
               [
-                {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-                {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-                {tx_body: {timestamp: 4, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}
+                {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+                {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+                {tx_body: {timestamp: 4, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}
               ]
             ]
           ),
           [
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-            {tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-            {tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-            {tx_body: {timestamp: 4, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-            {tx_body: {timestamp: 5, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+            {tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+            {tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+            {tx_body: {timestamp: 4, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+            {tx_body: {timestamp: 5, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}
           ]);
       });
 
@@ -406,50 +443,50 @@ describe('TransactionPool', async () => {
         assert.deepEqual(
           TransactionPool.mergeMultipleSortedArrays(
             [
-              [{tx_body: {timestamp: 4, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}],
+              [{tx_body: {timestamp: 4, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}],
               [
-                {tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-                {tx_body: {timestamp: 5, gas_price: 1}, extra: {gas: {service: 1}}}
+                {tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+                {tx_body: {timestamp: 5, gas_price: 1}, extra: {gas: {bandwidth: {service: 1}}}}
               ],
               [
-                {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-                {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-                {tx_body: {timestamp: 6, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}
+                {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+                {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+                {tx_body: {timestamp: 6, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}
               ]
             ]
           ),
           [
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-            {tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-            {tx_body: {timestamp: 5, gas_price: 1}, extra: {gas: {service: 1}}},
-            {tx_body: {timestamp: 4, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-            {tx_body: {timestamp: 6, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+            {tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+            {tx_body: {timestamp: 5, gas_price: 1}, extra: {gas: {bandwidth: {service: 1}}}},
+            {tx_body: {timestamp: 4, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+            {tx_body: {timestamp: 6, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}
           ]);
         assert.deepEqual(
           TransactionPool.mergeMultipleSortedArrays(
             [
-              [{tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}],
+              [{tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}],
               [
-                {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-                {tx_body: {timestamp: 4, gas_price: 1}, extra: {gas: {service: 1}}},
-                {tx_body: {timestamp: 6, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}
+                {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+                {tx_body: {timestamp: 4, gas_price: 1}, extra: {gas: {bandwidth: {service: 1}}}},
+                {tx_body: {timestamp: 6, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}
               ],
               [
-                {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-                {tx_body: {timestamp: 4, gas_price: 2}, extra: {gas: {service: 1}}},
-                {tx_body: {timestamp: 5, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}
+                {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+                {tx_body: {timestamp: 4, gas_price: 2}, extra: {gas: {bandwidth: {service: 1}}}},
+                {tx_body: {timestamp: 5, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}
               ]
             ]
           ),
           [
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-            {tx_body: {timestamp: 4, gas_price: 2}, extra: {gas: {service: 1}}},
-            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-            {tx_body: {timestamp: 4, gas_price: 1}, extra: {gas: {service: 1}}},
-            {tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-            {tx_body: {timestamp: 5, gas_price: 1}, extra: {gas: {app: {app1: 1}}}},
-            {tx_body: {timestamp: 6, gas_price: 1}, extra: {gas: {app: {app1: 1}}}}
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+            {tx_body: {timestamp: 4, gas_price: 2}, extra: {gas: {bandwidth: {service: 1}}}},
+            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+            {tx_body: {timestamp: 4, gas_price: 1}, extra: {gas: {bandwidth: {service: 1}}}},
+            {tx_body: {timestamp: 3, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+            {tx_body: {timestamp: 5, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}},
+            {tx_body: {timestamp: 6, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: 1}}}}}
           ]);
       });
     });
@@ -457,8 +494,6 @@ describe('TransactionPool', async () => {
 
   describe('Transaction selection & bandwidth budgets', () => {
     describe('performBandwidthChecks()', () => {
-      const { BANDWIDTH_BUDGET_PER_BLOCK, SERVICE_BANDWIDTH_BUDGET_PER_BLOCK } = require('../common/constants');
-      const APP_BANDWIDTH_BUDGET_PER_BLOCK = BANDWIDTH_BUDGET_PER_BLOCK - SERVICE_BANDWIDTH_BUDGET_PER_BLOCK;
       it('empty array', () => {
         assert.deepEqual(
           node.tp.performBandwidthChecks([], node.db),
@@ -470,24 +505,24 @@ describe('TransactionPool', async () => {
         node.db.setValuesForTesting(`/staking/app1/balance_total`, 1); // 100%
         assert.deepEqual(
           node.tp.performBandwidthChecks([
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {app: {app1: APP_BANDWIDTH_BUDGET_PER_BLOCK}}}},
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {service: SERVICE_BANDWIDTH_BUDGET_PER_BLOCK}}}
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: APPS_BANDWIDTH_BUDGET_PER_BLOCK}}}}},
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {service: SERVICE_BANDWIDTH_BUDGET_PER_BLOCK}}}}
           ], node.db),
           [
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {app: {app1: APP_BANDWIDTH_BUDGET_PER_BLOCK}}}},
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {service: SERVICE_BANDWIDTH_BUDGET_PER_BLOCK}}}
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: APPS_BANDWIDTH_BUDGET_PER_BLOCK}}}}},
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {service: SERVICE_BANDWIDTH_BUDGET_PER_BLOCK}}}}
           ]
         );
         assert.deepEqual(
           node.tp.performBandwidthChecks([
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {service: 1}}},
-            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {service: SERVICE_BANDWIDTH_BUDGET_PER_BLOCK - 1}}},
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {app: {app1: APP_BANDWIDTH_BUDGET_PER_BLOCK}}}}
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {service: 1}}}},
+            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {bandwidth: {service: SERVICE_BANDWIDTH_BUDGET_PER_BLOCK - 1}}}},
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: APPS_BANDWIDTH_BUDGET_PER_BLOCK}}}}}
           ], node.db),
           [
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {service: 1}}},
-            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {service: SERVICE_BANDWIDTH_BUDGET_PER_BLOCK - 1}}},
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {app: {app1: APP_BANDWIDTH_BUDGET_PER_BLOCK}}}}
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {service: 1}}}},
+            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {bandwidth: {service: SERVICE_BANDWIDTH_BUDGET_PER_BLOCK - 1}}}},
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: APPS_BANDWIDTH_BUDGET_PER_BLOCK}}}}}
           ]
         );
       });
@@ -496,32 +531,32 @@ describe('TransactionPool', async () => {
         node.db.setValuesForTesting(`/staking/app1/balance_total`, 1); // 100%
         assert.deepEqual(
           node.tp.performBandwidthChecks([
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {service: BANDWIDTH_BUDGET_PER_BLOCK + 1}}}
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {service: BANDWIDTH_BUDGET_PER_BLOCK + 1}}}}
           ], node.db),
           []
         );
         assert.deepEqual(
           node.tp.performBandwidthChecks([
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {service: 1}}},
-            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {service: BANDWIDTH_BUDGET_PER_BLOCK}}}
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {service: 1}}}},
+            {tx_body: {timestamp: 2, gas_price: 1}, extra: {gas: {bandwidth: {service: BANDWIDTH_BUDGET_PER_BLOCK}}}}
           ], node.db),
-          [{tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {service: 1}}}]
+          [{tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {service: 1}}}}]
         );
       });
 
       it('within SERVICE_BANDWIDTH_BUDGET_PER_BLOCK', () => {
         assert.deepEqual(
           node.tp.performBandwidthChecks([
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {service: SERVICE_BANDWIDTH_BUDGET_PER_BLOCK}}}
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {service: SERVICE_BANDWIDTH_BUDGET_PER_BLOCK}}}}
           ], node.db),
-          [{tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {service: SERVICE_BANDWIDTH_BUDGET_PER_BLOCK}}}]
+          [{tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {service: SERVICE_BANDWIDTH_BUDGET_PER_BLOCK}}}}]
         );
       });
 
       it('cannot exceed SERVICE_BANDWIDTH_BUDGET_PER_BLOCK', () => {
         assert.deepEqual(
           node.tp.performBandwidthChecks([
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {service: SERVICE_BANDWIDTH_BUDGET_PER_BLOCK + 1}}}
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {service: SERVICE_BANDWIDTH_BUDGET_PER_BLOCK + 1}}}}
           ], node.db),
           []
         );
@@ -532,37 +567,55 @@ describe('TransactionPool', async () => {
         node.db.setValuesForTesting(`/staking/app2/balance_total`, 10); // 50%
         assert.deepEqual(
           node.tp.performBandwidthChecks([
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {service: SERVICE_BANDWIDTH_BUDGET_PER_BLOCK}}},
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {app: {app1: APP_BANDWIDTH_BUDGET_PER_BLOCK / 2}}}},
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {app: {app2: APP_BANDWIDTH_BUDGET_PER_BLOCK / 2}}}}
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {service: SERVICE_BANDWIDTH_BUDGET_PER_BLOCK}}}},
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: APPS_BANDWIDTH_BUDGET_PER_BLOCK / 2}}}}},
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app2: APPS_BANDWIDTH_BUDGET_PER_BLOCK / 2}}}}}
           ], node.db),
           [
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {service: SERVICE_BANDWIDTH_BUDGET_PER_BLOCK}}},
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {app: {app1: APP_BANDWIDTH_BUDGET_PER_BLOCK / 2}}}},
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {app: {app2: APP_BANDWIDTH_BUDGET_PER_BLOCK / 2}}}}
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {service: SERVICE_BANDWIDTH_BUDGET_PER_BLOCK}}}},
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: APPS_BANDWIDTH_BUDGET_PER_BLOCK / 2}}}}},
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app2: APPS_BANDWIDTH_BUDGET_PER_BLOCK / 2}}}}}
           ]
         );
         assert.deepEqual(
           node.tp.performBandwidthChecks([
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {service: SERVICE_BANDWIDTH_BUDGET_PER_BLOCK}}},
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {app: {app1: (APP_BANDWIDTH_BUDGET_PER_BLOCK / 2) + 1}}}},
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {app: {app2: APP_BANDWIDTH_BUDGET_PER_BLOCK / 2}}}}
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {service: SERVICE_BANDWIDTH_BUDGET_PER_BLOCK}}}},
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: (APPS_BANDWIDTH_BUDGET_PER_BLOCK / 2) + 1}}}}},
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app2: APPS_BANDWIDTH_BUDGET_PER_BLOCK / 2}}}}}
           ], node.db),
           [
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {service: SERVICE_BANDWIDTH_BUDGET_PER_BLOCK}}},
-            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {app: {app2: APP_BANDWIDTH_BUDGET_PER_BLOCK / 2}}}}
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {service: SERVICE_BANDWIDTH_BUDGET_PER_BLOCK}}}},
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app2: APPS_BANDWIDTH_BUDGET_PER_BLOCK / 2}}}}}
           ]
         );
       });
 
+      it('within 10% free tier for bandwidth budget', () => {
+        assert.deepEqual(
+          node.tp.performBandwidthChecks([
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: FREE_BANDWIDTH_BUDGET_PER_BLOCK}}}}}
+          ], node.db),
+          [{tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: FREE_BANDWIDTH_BUDGET_PER_BLOCK}}}}}]
+        );
+      });
+
+      it('cannot exceed 10% free tier for bandwidth budget', () => {
+        assert.deepEqual(
+          node.tp.performBandwidthChecks([
+            {tx_body: {timestamp: 1, gas_price: 1}, extra: {gas: {bandwidth: {app: {app1: FREE_BANDWIDTH_BUDGET_PER_BLOCK + 1}}}}}
+          ], node.db),
+          []
+        );
+      });
+
       it('correctly discards higher nonced txs', () => {
         assert.deepEqual(
           node.tp.performBandwidthChecks([
-            {tx_body: {timestamp: 1, gas_price: 1, nonce: 0}, address: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1', extra: {gas: {service: 1}}},
-            {tx_body: {timestamp: 1, gas_price: 1, nonce: 1}, address: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1', extra: {gas: {service: SERVICE_BANDWIDTH_BUDGET_PER_BLOCK}}},
-            {tx_body: {timestamp: 1, gas_price: 1, nonce: 2}, address: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1', extra: {gas: {service: 1}}}
+            {tx_body: {timestamp: 1, gas_price: 1, nonce: 0}, address: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1', extra: {gas: {bandwidth: {service: 1}}}},
+            {tx_body: {timestamp: 1, gas_price: 1, nonce: 1}, address: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1', extra: {gas: {bandwidth: {service: SERVICE_BANDWIDTH_BUDGET_PER_BLOCK}}}},
+            {tx_body: {timestamp: 1, gas_price: 1, nonce: 2}, address: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1', extra: {gas: {bandwidth: {service: 1}}}}
           ], node.db),
-          [{tx_body: {timestamp: 1, gas_price: 1, nonce: 0}, address: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1', extra: {gas: {service: 1}}}]
+          [{tx_body: {timestamp: 1, gas_price: 1, nonce: 0}, address: '0x09A0d53FDf1c36A131938eb379b98910e55EEfe1', extra: {gas: {bandwidth: {service: 1}}}}]
         );
       });
     });
@@ -577,6 +630,7 @@ describe('TransactionPool', async () => {
           node.account.address, []);
       const newTransactions = {};
       newTransactions[node.account.address] = [];
+      let initialNonce = node.getNonce();
       for (let i = 0; i < 10; i++) {
         newTransactions[node.account.address].push(getTransaction(node, {
           operation: {
@@ -584,7 +638,7 @@ describe('TransactionPool', async () => {
             ref: 'REF',
             value: 'VALUE',
           },
-          nonce: node.nonce++,
+          nonce: initialNonce++,
           gas_price: 1
         }));
         node.tp.addTransaction(newTransactions[node.account.address][i]);
diff --git a/yarn.lock b/yarn.lock
index 4e9d555ea..6547a36fd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -977,9 +977,9 @@ color-name@^1.0.0, color-name@~1.1.4:
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
 color-string@^1.5.2:
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.4.tgz#dd51cd25cfee953d138fe4002372cc3d0e504cb6"
-  integrity sha512-57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw==
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.5.tgz#65474a8f0e7439625f3d27a6a19d89fc45223014"
+  integrity sha512-jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg==
   dependencies:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"