From 4dbc6d2dc24febe9f7e7a040bd1ee6820c1766e4 Mon Sep 17 00:00:00 2001
From: success-OG <tawfiqamuhammad@gmail.com>
Date: Sun, 31 May 2026 11:26:48 +0100
Subject: [PATCH] feat(contracts): treasury epoch limits, min shares, rebalance
 order, loss CB

---
 contracts/vault/src/lib.rs                    | 493 ++++++++++++++++++
 .../fuzz_contract_calculate_round_trip.1.json |  32 +-
 ...fuzz_contract_calculate_round_trip.10.json |  54 +-
 ...uzz_contract_calculate_round_trip.100.json |  54 +-
 ...uzz_contract_calculate_round_trip.101.json |  54 +-
 ...uzz_contract_calculate_round_trip.102.json |  54 +-
 ...uzz_contract_calculate_round_trip.103.json |  54 +-
 ...uzz_contract_calculate_round_trip.104.json |  54 +-
 ...uzz_contract_calculate_round_trip.105.json |  54 +-
 ...uzz_contract_calculate_round_trip.106.json |  54 +-
 ...uzz_contract_calculate_round_trip.107.json |  54 +-
 ...uzz_contract_calculate_round_trip.108.json |  54 +-
 ...uzz_contract_calculate_round_trip.109.json |  54 +-
 ...fuzz_contract_calculate_round_trip.11.json |  54 +-
 ...uzz_contract_calculate_round_trip.110.json |  54 +-
 ...uzz_contract_calculate_round_trip.111.json |  54 +-
 ...uzz_contract_calculate_round_trip.112.json |  54 +-
 ...uzz_contract_calculate_round_trip.113.json |  54 +-
 ...uzz_contract_calculate_round_trip.114.json |  54 +-
 ...uzz_contract_calculate_round_trip.115.json |  54 +-
 ...uzz_contract_calculate_round_trip.116.json |  54 +-
 ...uzz_contract_calculate_round_trip.117.json |  54 +-
 ...uzz_contract_calculate_round_trip.118.json |  54 +-
 ...uzz_contract_calculate_round_trip.119.json |  54 +-
 ...fuzz_contract_calculate_round_trip.12.json |  54 +-
 ...uzz_contract_calculate_round_trip.120.json |  54 +-
 ...uzz_contract_calculate_round_trip.121.json |  54 +-
 ...uzz_contract_calculate_round_trip.122.json |  54 +-
 ...uzz_contract_calculate_round_trip.123.json |  54 +-
 ...uzz_contract_calculate_round_trip.124.json |  54 +-
 ...uzz_contract_calculate_round_trip.125.json |  54 +-
 ...uzz_contract_calculate_round_trip.126.json |  54 +-
 ...uzz_contract_calculate_round_trip.127.json |  54 +-
 ...uzz_contract_calculate_round_trip.128.json |  54 +-
 ...uzz_contract_calculate_round_trip.129.json |  54 +-
 ...fuzz_contract_calculate_round_trip.13.json |  54 +-
 ...uzz_contract_calculate_round_trip.130.json |  54 +-
 ...uzz_contract_calculate_round_trip.131.json |  54 +-
 ...uzz_contract_calculate_round_trip.132.json |  54 +-
 ...uzz_contract_calculate_round_trip.133.json |  54 +-
 ...uzz_contract_calculate_round_trip.134.json |  54 +-
 ...uzz_contract_calculate_round_trip.135.json |  54 +-
 ...uzz_contract_calculate_round_trip.136.json |  54 +-
 ...uzz_contract_calculate_round_trip.137.json |  54 +-
 ...uzz_contract_calculate_round_trip.138.json |  54 +-
 ...uzz_contract_calculate_round_trip.139.json |  54 +-
 ...fuzz_contract_calculate_round_trip.14.json |  54 +-
 ...uzz_contract_calculate_round_trip.140.json |  54 +-
 ...uzz_contract_calculate_round_trip.141.json |  54 +-
 ...uzz_contract_calculate_round_trip.142.json |  54 +-
 ...uzz_contract_calculate_round_trip.143.json |  54 +-
 ...uzz_contract_calculate_round_trip.144.json |  54 +-
 ...uzz_contract_calculate_round_trip.145.json |  54 +-
 ...uzz_contract_calculate_round_trip.146.json |  54 +-
 ...uzz_contract_calculate_round_trip.147.json |  54 +-
 ...uzz_contract_calculate_round_trip.148.json |  54 +-
 ...uzz_contract_calculate_round_trip.149.json |  54 +-
 ...fuzz_contract_calculate_round_trip.15.json |  54 +-
 ...uzz_contract_calculate_round_trip.150.json |  54 +-
 ...uzz_contract_calculate_round_trip.151.json |  54 +-
 ...uzz_contract_calculate_round_trip.152.json |  54 +-
 ...uzz_contract_calculate_round_trip.153.json |  54 +-
 ...uzz_contract_calculate_round_trip.154.json |  54 +-
 ...uzz_contract_calculate_round_trip.155.json |  54 +-
 ...uzz_contract_calculate_round_trip.156.json |  54 +-
 ...uzz_contract_calculate_round_trip.157.json |  54 +-
 ...uzz_contract_calculate_round_trip.158.json |  54 +-
 ...uzz_contract_calculate_round_trip.159.json |  54 +-
 ...fuzz_contract_calculate_round_trip.16.json |  54 +-
 ...uzz_contract_calculate_round_trip.160.json |  54 +-
 ...uzz_contract_calculate_round_trip.161.json |  54 +-
 ...uzz_contract_calculate_round_trip.162.json |  54 +-
 ...uzz_contract_calculate_round_trip.163.json |  54 +-
 ...uzz_contract_calculate_round_trip.164.json |  54 +-
 ...uzz_contract_calculate_round_trip.165.json |  54 +-
 ...uzz_contract_calculate_round_trip.166.json |  54 +-
 ...uzz_contract_calculate_round_trip.167.json |  54 +-
 ...uzz_contract_calculate_round_trip.168.json |  54 +-
 ...uzz_contract_calculate_round_trip.169.json |  54 +-
 ...fuzz_contract_calculate_round_trip.17.json |  54 +-
 ...uzz_contract_calculate_round_trip.170.json |  54 +-
 ...uzz_contract_calculate_round_trip.171.json |  54 +-
 ...uzz_contract_calculate_round_trip.172.json |  54 +-
 ...uzz_contract_calculate_round_trip.173.json |  54 +-
 ...uzz_contract_calculate_round_trip.174.json |  54 +-
 ...uzz_contract_calculate_round_trip.175.json |  54 +-
 ...uzz_contract_calculate_round_trip.176.json |  54 +-
 ...uzz_contract_calculate_round_trip.177.json |  54 +-
 ...uzz_contract_calculate_round_trip.178.json |  54 +-
 ...uzz_contract_calculate_round_trip.179.json |  54 +-
 ...fuzz_contract_calculate_round_trip.18.json |  54 +-
 ...uzz_contract_calculate_round_trip.180.json |  54 +-
 ...uzz_contract_calculate_round_trip.181.json |  54 +-
 ...uzz_contract_calculate_round_trip.182.json |  54 +-
 ...uzz_contract_calculate_round_trip.183.json |  54 +-
 ...uzz_contract_calculate_round_trip.184.json |  54 +-
 ...uzz_contract_calculate_round_trip.185.json |  54 +-
 ...uzz_contract_calculate_round_trip.186.json |  54 +-
 ...uzz_contract_calculate_round_trip.187.json |  54 +-
 ...uzz_contract_calculate_round_trip.188.json |  54 +-
 ...uzz_contract_calculate_round_trip.189.json |  54 +-
 ...fuzz_contract_calculate_round_trip.19.json |  54 +-
 ...uzz_contract_calculate_round_trip.190.json |  54 +-
 ...uzz_contract_calculate_round_trip.191.json |  54 +-
 ...uzz_contract_calculate_round_trip.192.json |  54 +-
 ...uzz_contract_calculate_round_trip.193.json |  54 +-
 ...uzz_contract_calculate_round_trip.194.json |  54 +-
 ...uzz_contract_calculate_round_trip.195.json |  54 +-
 ...uzz_contract_calculate_round_trip.196.json |  54 +-
 ...uzz_contract_calculate_round_trip.197.json |  54 +-
 ...uzz_contract_calculate_round_trip.198.json |  54 +-
 ...uzz_contract_calculate_round_trip.199.json |  54 +-
 .../fuzz_contract_calculate_round_trip.2.json |  54 +-
 ...fuzz_contract_calculate_round_trip.20.json |  54 +-
 ...uzz_contract_calculate_round_trip.200.json |  54 +-
 ...uzz_contract_calculate_round_trip.201.json |  54 +-
 ...uzz_contract_calculate_round_trip.202.json |  54 +-
 ...uzz_contract_calculate_round_trip.203.json |  54 +-
 ...uzz_contract_calculate_round_trip.204.json |  54 +-
 ...uzz_contract_calculate_round_trip.205.json |  54 +-
 ...uzz_contract_calculate_round_trip.206.json |  54 +-
 ...uzz_contract_calculate_round_trip.207.json |  54 +-
 ...uzz_contract_calculate_round_trip.208.json |  54 +-
 ...uzz_contract_calculate_round_trip.209.json |  54 +-
 ...fuzz_contract_calculate_round_trip.21.json |  54 +-
 ...uzz_contract_calculate_round_trip.210.json |  54 +-
 ...uzz_contract_calculate_round_trip.211.json |  54 +-
 ...uzz_contract_calculate_round_trip.212.json |  54 +-
 ...uzz_contract_calculate_round_trip.213.json |  54 +-
 ...uzz_contract_calculate_round_trip.214.json |  54 +-
 ...uzz_contract_calculate_round_trip.215.json |  54 +-
 ...uzz_contract_calculate_round_trip.216.json |  54 +-
 ...uzz_contract_calculate_round_trip.217.json |  54 +-
 ...uzz_contract_calculate_round_trip.218.json |  54 +-
 ...uzz_contract_calculate_round_trip.219.json |  54 +-
 ...fuzz_contract_calculate_round_trip.22.json |  54 +-
 ...uzz_contract_calculate_round_trip.220.json |  54 +-
 ...uzz_contract_calculate_round_trip.221.json |  54 +-
 ...uzz_contract_calculate_round_trip.222.json |  54 +-
 ...uzz_contract_calculate_round_trip.223.json |  54 +-
 ...uzz_contract_calculate_round_trip.224.json |  54 +-
 ...uzz_contract_calculate_round_trip.225.json |  54 +-
 ...uzz_contract_calculate_round_trip.226.json |  54 +-
 ...uzz_contract_calculate_round_trip.227.json |  54 +-
 ...uzz_contract_calculate_round_trip.228.json |  54 +-
 ...uzz_contract_calculate_round_trip.229.json |  54 +-
 ...fuzz_contract_calculate_round_trip.23.json |  54 +-
 ...uzz_contract_calculate_round_trip.230.json |  54 +-
 ...uzz_contract_calculate_round_trip.231.json |  54 +-
 ...uzz_contract_calculate_round_trip.232.json |  54 +-
 ...uzz_contract_calculate_round_trip.233.json |  54 +-
 ...uzz_contract_calculate_round_trip.234.json |  54 +-
 ...uzz_contract_calculate_round_trip.235.json |  54 +-
 ...uzz_contract_calculate_round_trip.236.json |  54 +-
 ...uzz_contract_calculate_round_trip.237.json |  54 +-
 ...uzz_contract_calculate_round_trip.238.json |  54 +-
 ...uzz_contract_calculate_round_trip.239.json |  54 +-
 ...fuzz_contract_calculate_round_trip.24.json |  54 +-
 ...uzz_contract_calculate_round_trip.240.json |  54 +-
 ...uzz_contract_calculate_round_trip.241.json |  54 +-
 ...uzz_contract_calculate_round_trip.242.json |  54 +-
 ...uzz_contract_calculate_round_trip.243.json |  54 +-
 ...uzz_contract_calculate_round_trip.244.json |  54 +-
 ...uzz_contract_calculate_round_trip.245.json |  54 +-
 ...uzz_contract_calculate_round_trip.246.json |  54 +-
 ...uzz_contract_calculate_round_trip.247.json |  54 +-
 ...uzz_contract_calculate_round_trip.248.json |  54 +-
 ...uzz_contract_calculate_round_trip.249.json |  54 +-
 ...fuzz_contract_calculate_round_trip.25.json |  54 +-
 ...uzz_contract_calculate_round_trip.250.json |  54 +-
 ...uzz_contract_calculate_round_trip.251.json |  54 +-
 ...uzz_contract_calculate_round_trip.252.json |  54 +-
 ...uzz_contract_calculate_round_trip.253.json |  54 +-
 ...uzz_contract_calculate_round_trip.254.json |  54 +-
 ...uzz_contract_calculate_round_trip.255.json |  54 +-
 ...uzz_contract_calculate_round_trip.256.json |  54 +-
 ...uzz_contract_calculate_round_trip.257.json |  54 +-
 ...fuzz_contract_calculate_round_trip.26.json |  54 +-
 ...fuzz_contract_calculate_round_trip.27.json |  54 +-
 ...fuzz_contract_calculate_round_trip.28.json |  54 +-
 ...fuzz_contract_calculate_round_trip.29.json |  54 +-
 .../fuzz_contract_calculate_round_trip.3.json |  54 +-
 ...fuzz_contract_calculate_round_trip.30.json |  54 +-
 ...fuzz_contract_calculate_round_trip.31.json |  54 +-
 ...fuzz_contract_calculate_round_trip.32.json |  54 +-
 ...fuzz_contract_calculate_round_trip.33.json |  54 +-
 ...fuzz_contract_calculate_round_trip.34.json |  54 +-
 ...fuzz_contract_calculate_round_trip.35.json |  54 +-
 ...fuzz_contract_calculate_round_trip.36.json |  54 +-
 ...fuzz_contract_calculate_round_trip.37.json |  54 +-
 ...fuzz_contract_calculate_round_trip.38.json |  54 +-
 ...fuzz_contract_calculate_round_trip.39.json |  54 +-
 .../fuzz_contract_calculate_round_trip.4.json |  54 +-
 ...fuzz_contract_calculate_round_trip.40.json |  54 +-
 ...fuzz_contract_calculate_round_trip.41.json |  54 +-
 ...fuzz_contract_calculate_round_trip.42.json |  54 +-
 ...fuzz_contract_calculate_round_trip.43.json |  54 +-
 ...fuzz_contract_calculate_round_trip.44.json |  54 +-
 ...fuzz_contract_calculate_round_trip.45.json |  54 +-
 ...fuzz_contract_calculate_round_trip.46.json |  54 +-
 ...fuzz_contract_calculate_round_trip.47.json |  54 +-
 ...fuzz_contract_calculate_round_trip.48.json |  54 +-
 ...fuzz_contract_calculate_round_trip.49.json |  54 +-
 .../fuzz_contract_calculate_round_trip.5.json |  54 +-
 ...fuzz_contract_calculate_round_trip.50.json |  54 +-
 ...fuzz_contract_calculate_round_trip.51.json |  54 +-
 ...fuzz_contract_calculate_round_trip.52.json |  54 +-
 ...fuzz_contract_calculate_round_trip.53.json |  54 +-
 ...fuzz_contract_calculate_round_trip.54.json |  54 +-
 ...fuzz_contract_calculate_round_trip.55.json |  54 +-
 ...fuzz_contract_calculate_round_trip.56.json |  54 +-
 ...fuzz_contract_calculate_round_trip.57.json |  54 +-
 ...fuzz_contract_calculate_round_trip.58.json |  54 +-
 ...fuzz_contract_calculate_round_trip.59.json |  54 +-
 .../fuzz_contract_calculate_round_trip.6.json |  54 +-
 ...fuzz_contract_calculate_round_trip.60.json |  54 +-
 ...fuzz_contract_calculate_round_trip.61.json |  54 +-
 ...fuzz_contract_calculate_round_trip.62.json |  54 +-
 ...fuzz_contract_calculate_round_trip.63.json |  54 +-
 ...fuzz_contract_calculate_round_trip.64.json |  54 +-
 ...fuzz_contract_calculate_round_trip.65.json |  54 +-
 ...fuzz_contract_calculate_round_trip.66.json |  54 +-
 ...fuzz_contract_calculate_round_trip.67.json |  54 +-
 ...fuzz_contract_calculate_round_trip.68.json |  54 +-
 ...fuzz_contract_calculate_round_trip.69.json |  54 +-
 .../fuzz_contract_calculate_round_trip.7.json |  54 +-
 ...fuzz_contract_calculate_round_trip.70.json |  54 +-
 ...fuzz_contract_calculate_round_trip.71.json |  54 +-
 ...fuzz_contract_calculate_round_trip.72.json |  54 +-
 ...fuzz_contract_calculate_round_trip.73.json |  54 +-
 ...fuzz_contract_calculate_round_trip.74.json |  54 +-
 ...fuzz_contract_calculate_round_trip.75.json |  54 +-
 ...fuzz_contract_calculate_round_trip.76.json |  54 +-
 ...fuzz_contract_calculate_round_trip.77.json |  54 +-
 ...fuzz_contract_calculate_round_trip.78.json |  54 +-
 ...fuzz_contract_calculate_round_trip.79.json |  54 +-
 .../fuzz_contract_calculate_round_trip.8.json |  54 +-
 ...fuzz_contract_calculate_round_trip.80.json |  54 +-
 ...fuzz_contract_calculate_round_trip.81.json |  54 +-
 ...fuzz_contract_calculate_round_trip.82.json |  54 +-
 ...fuzz_contract_calculate_round_trip.83.json |  54 +-
 ...fuzz_contract_calculate_round_trip.84.json |  54 +-
 ...fuzz_contract_calculate_round_trip.85.json |  54 +-
 ...fuzz_contract_calculate_round_trip.86.json |  54 +-
 ...fuzz_contract_calculate_round_trip.87.json |  54 +-
 ...fuzz_contract_calculate_round_trip.88.json |  54 +-
 ...fuzz_contract_calculate_round_trip.89.json |  54 +-
 .../fuzz_contract_calculate_round_trip.9.json |  54 +-
 ...fuzz_contract_calculate_round_trip.90.json |  54 +-
 ...fuzz_contract_calculate_round_trip.91.json |  54 +-
 ...fuzz_contract_calculate_round_trip.92.json |  54 +-
 ...fuzz_contract_calculate_round_trip.93.json |  54 +-
 ...fuzz_contract_calculate_round_trip.94.json |  54 +-
 ...fuzz_contract_calculate_round_trip.95.json |  54 +-
 ...fuzz_contract_calculate_round_trip.96.json |  54 +-
 ...fuzz_contract_calculate_round_trip.97.json |  54 +-
 ...fuzz_contract_calculate_round_trip.98.json |  54 +-
 ...fuzz_contract_calculate_round_trip.99.json |  54 +-
 .../fuzz_deposit_withdraw_no_profit.1.json    |  32 +-
 .../fuzz_deposit_withdraw_no_profit.10.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.100.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.101.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.102.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.103.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.104.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.105.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.106.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.107.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.108.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.109.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.11.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.110.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.111.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.112.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.113.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.114.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.115.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.116.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.117.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.118.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.119.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.12.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.120.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.121.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.122.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.123.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.124.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.125.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.126.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.127.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.128.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.129.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.13.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.130.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.131.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.132.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.133.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.134.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.135.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.136.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.137.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.138.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.139.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.14.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.140.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.141.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.142.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.143.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.144.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.145.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.146.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.147.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.148.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.149.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.15.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.150.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.151.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.152.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.153.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.154.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.155.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.156.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.157.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.158.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.159.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.16.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.160.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.161.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.162.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.163.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.164.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.165.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.166.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.167.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.168.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.169.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.17.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.170.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.171.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.172.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.173.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.174.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.175.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.176.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.177.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.178.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.179.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.18.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.180.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.181.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.182.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.183.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.184.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.185.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.186.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.187.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.188.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.189.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.19.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.190.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.191.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.192.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.193.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.194.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.195.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.196.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.197.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.198.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.199.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.2.json    |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.20.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.200.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.201.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.202.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.203.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.204.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.205.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.206.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.207.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.208.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.209.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.21.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.210.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.211.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.212.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.213.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.214.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.215.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.216.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.217.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.218.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.219.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.22.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.220.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.221.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.222.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.223.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.224.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.225.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.226.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.227.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.228.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.229.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.23.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.230.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.231.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.232.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.233.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.234.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.235.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.236.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.237.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.238.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.239.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.24.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.240.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.241.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.242.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.243.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.244.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.245.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.246.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.247.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.248.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.249.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.25.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.250.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.251.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.252.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.253.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.254.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.255.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.256.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.257.json  |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.26.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.27.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.28.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.29.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.3.json    |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.30.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.31.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.32.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.33.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.34.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.35.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.36.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.37.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.38.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.39.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.4.json    |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.40.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.41.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.42.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.43.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.44.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.45.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.46.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.47.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.48.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.49.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.5.json    |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.50.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.51.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.52.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.53.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.54.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.55.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.56.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.57.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.58.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.59.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.6.json    |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.60.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.61.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.62.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.63.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.64.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.65.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.66.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.67.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.68.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.69.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.7.json    |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.70.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.71.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.72.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.73.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.74.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.75.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.76.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.77.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.78.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.79.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.8.json    |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.80.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.81.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.82.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.83.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.84.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.85.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.86.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.87.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.88.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.89.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.9.json    |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.90.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.91.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.92.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.93.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.94.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.95.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.96.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.97.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.98.json   |  68 ++-
 .../fuzz_deposit_withdraw_no_profit.99.json   |  68 ++-
 .../fuzz_tiny_deposit_with_yield.1.json       |  32 +-
 .../fuzz_tiny_deposit_with_yield.10.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.100.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.101.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.102.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.103.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.104.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.105.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.106.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.107.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.108.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.109.json     |  44 +-
 .../fuzz_tiny_deposit_with_yield.11.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.110.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.111.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.112.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.113.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.114.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.115.json     |  44 +-
 .../fuzz_tiny_deposit_with_yield.116.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.117.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.118.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.119.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.12.json      |  44 +-
 .../fuzz_tiny_deposit_with_yield.120.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.121.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.122.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.123.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.124.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.125.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.126.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.127.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.128.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.129.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.13.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.130.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.131.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.132.json     |  44 +-
 .../fuzz_tiny_deposit_with_yield.133.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.134.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.135.json     |  44 +-
 .../fuzz_tiny_deposit_with_yield.136.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.137.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.138.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.139.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.14.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.140.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.141.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.142.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.143.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.144.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.145.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.146.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.147.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.148.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.149.json     |  44 +-
 .../fuzz_tiny_deposit_with_yield.15.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.150.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.151.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.152.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.153.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.154.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.155.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.156.json     |  44 +-
 .../fuzz_tiny_deposit_with_yield.157.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.158.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.159.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.16.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.160.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.161.json     |  44 +-
 .../fuzz_tiny_deposit_with_yield.162.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.163.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.164.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.165.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.166.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.167.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.168.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.169.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.17.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.170.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.171.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.172.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.173.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.174.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.175.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.176.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.177.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.178.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.179.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.18.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.180.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.181.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.182.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.183.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.184.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.185.json     |  44 +-
 .../fuzz_tiny_deposit_with_yield.186.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.187.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.188.json     |  44 +-
 .../fuzz_tiny_deposit_with_yield.189.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.19.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.190.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.191.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.192.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.193.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.194.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.195.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.196.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.197.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.198.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.199.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.2.json       |  48 +-
 .../fuzz_tiny_deposit_with_yield.20.json      |  44 +-
 .../fuzz_tiny_deposit_with_yield.200.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.201.json     |  44 +-
 .../fuzz_tiny_deposit_with_yield.202.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.203.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.204.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.205.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.206.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.207.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.208.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.209.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.21.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.210.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.211.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.212.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.213.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.214.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.215.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.216.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.217.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.218.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.219.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.22.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.220.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.221.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.222.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.223.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.224.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.225.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.226.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.227.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.228.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.229.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.23.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.230.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.231.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.232.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.233.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.234.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.235.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.236.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.237.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.238.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.239.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.24.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.240.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.241.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.242.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.243.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.244.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.245.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.246.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.247.json     |  44 +-
 .../fuzz_tiny_deposit_with_yield.248.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.249.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.25.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.250.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.251.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.252.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.253.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.254.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.255.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.256.json     |  44 +-
 .../fuzz_tiny_deposit_with_yield.257.json     |  48 +-
 .../fuzz_tiny_deposit_with_yield.26.json      |  44 +-
 .../fuzz_tiny_deposit_with_yield.27.json      |  44 +-
 .../fuzz_tiny_deposit_with_yield.28.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.29.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.3.json       |  48 +-
 .../fuzz_tiny_deposit_with_yield.30.json      |  44 +-
 .../fuzz_tiny_deposit_with_yield.31.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.32.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.33.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.34.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.35.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.36.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.37.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.38.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.39.json      |  44 +-
 .../fuzz_tiny_deposit_with_yield.4.json       |  48 +-
 .../fuzz_tiny_deposit_with_yield.40.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.41.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.42.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.43.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.44.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.45.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.46.json      |  44 +-
 .../fuzz_tiny_deposit_with_yield.47.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.48.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.49.json      |  44 +-
 .../fuzz_tiny_deposit_with_yield.5.json       |  48 +-
 .../fuzz_tiny_deposit_with_yield.50.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.51.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.52.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.53.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.54.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.55.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.56.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.57.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.58.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.59.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.6.json       |  48 +-
 .../fuzz_tiny_deposit_with_yield.60.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.61.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.62.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.63.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.64.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.65.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.66.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.67.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.68.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.69.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.7.json       |  48 +-
 .../fuzz_tiny_deposit_with_yield.70.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.71.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.72.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.73.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.74.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.75.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.76.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.77.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.78.json      |  44 +-
 .../fuzz_tiny_deposit_with_yield.79.json      |  44 +-
 .../fuzz_tiny_deposit_with_yield.8.json       |  48 +-
 .../fuzz_tiny_deposit_with_yield.80.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.81.json      |  44 +-
 .../fuzz_tiny_deposit_with_yield.82.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.83.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.84.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.85.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.86.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.87.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.88.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.89.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.9.json       |  48 +-
 .../fuzz_tiny_deposit_with_yield.90.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.91.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.92.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.93.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.94.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.95.json      |  44 +-
 .../fuzz_tiny_deposit_with_yield.96.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.97.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.98.json      |  48 +-
 .../fuzz_tiny_deposit_with_yield.99.json      |  48 +-
 ...accrue_yield_increases_total_assets.1.json |  14 +-
 .../test_add_shipment_duplicate_panics.1.json |  14 +-
 ...t_add_shipment_stores_and_retrieves.1.json |  14 +-
 ...est_add_shipments_are_stored_sorted.1.json |  14 +-
 .../test_benji_connector_reports_yield.1.json |  32 +-
 ...gure_korean_strategy_stores_address.1.json |  14 +-
 ...egy_proposal_does_not_require_admin.1.json |  14 +-
 ...test_deposit_does_not_require_admin.1.json |  32 +-
 ...eposit_first_user_one_to_one_shares.1.json |  32 +-
 ...gative_returns_invalid_amount_error.1.json |  14 +-
 ...sit_second_user_proportional_shares.1.json |  50 +-
 .../test/test_deposit_state_management.1.json |  32 +-
 ...after_large_yield_mints_zero_shares.1.json |  32 +-
 ...st_governance_duplicate_vote_panics.1.json |  14 +-
 ...ance_execute_below_threshold_panics.1.json |  14 +-
 ..._governance_execute_rejected_panics.1.json |  14 +-
 ...est_governance_execute_twice_panics.1.json |  14 +-
 .../test_governance_full_happy_path.1.json    |  14 +-
 ...ance_multiple_proposals_independent.1.json |  14 +-
 ...test_governance_sets_benji_strategy.1.json |  14 +-
 ...ce_vote_on_executed_proposal_panics.1.json |  14 +-
 .../test_governance_zero_weight_panics.1.json |  14 +-
 .../test_initialize_double_init_panics.1.json |  14 +-
 ...ant_full_exit_zeroes_all_accounting.1.json |  50 +-
 ...st_invariant_share_asset_round_trip.1.json |  32 +-
 ...onsistent_after_multi_user_sequence.1.json |  68 ++-
 ...total_shares_equals_sum_of_balances.1.json |  68 ++-
 ...d_accrual_never_changes_share_count.1.json |  32 +-
 ...tiple_deposits_atomic_state_updates.1.json |  50 +-
 ...d_before_strategy_configured_panics.1.json |  14 +-
 ...yield_rejects_unauthorized_strategy.1.json |  14 +-
 ...t_benji_yield_wrong_strategy_panics.1.json |  14 +-
 ...port_benji_yield_zero_amount_panics.1.json |  14 +-
 .../test_set_dao_threshold_happy_path.1.json  |  14 +-
 ...t_set_dao_threshold_negative_panics.1.json |  14 +-
 .../test_set_dao_threshold_zero_panics.1.json |  14 +-
 ...ids_by_status_zero_page_size_panics.1.json |  14 +-
 ...ation_cursor_past_end_returns_empty.1.json |  14 +-
 ...gination_empty_status_returns_empty.1.json |  14 +-
 ...ment_pagination_exhausts_completely.1.json |  14 +-
 ...ent_pagination_max_page_size_capped.1.json |  14 +-
 ...pments_across_statuses_are_isolated.1.json |  14 +-
 ...te_shipment_full_lifecycle_statuses.1.json |  14 +-
 ...ent_status_moves_id_between_buckets.1.json |  14 +-
 ...shipment_status_same_status_is_noop.1.json |  14 +-
 .../test/test_vault_flow_legacy.1.json        |  14 +-
 .../test_vault_with_benji_strategy.1.json     | 130 ++++-
 ...est_withdraw_does_not_require_admin.1.json |  32 +-
 ...xact_balance_drains_user_completely.1.json |  32 +-
 ...raw_from_zero_balance_returns_error.1.json |  14 +-
 ..._happy_path_receives_correct_assets.1.json |  32 +-
 ...balance_returns_insufficient_shares.1.json |  32 +-
 ...hdraw_negative_shares_returns_error.1.json |  32 +-
 .../test_withdraw_state_management.1.json     |  32 +-
 ...accrual_maintains_state_consistency.1.json |  32 +-
 827 files changed, 31799 insertions(+), 13568 deletions(-)

diff --git a/contracts/vault/src/lib.rs b/contracts/vault/src/lib.rs
index e84f9700..ab72d051 100644
--- a/contracts/vault/src/lib.rs
+++ b/contracts/vault/src/lib.rs
@@ -149,6 +149,16 @@ pub enum DataKey {
     PriceOracle,
     OracleEnabled,
     OracleHeartbeat,
+    // Treasury withdrawal rate limit (per-epoch cap)
+    TreasuryWithdrawEpochDuration,
+    TreasuryWithdrawEpochCap,
+    TreasuryWithdrawEpochWindow,
+    // Minimum outstanding share supply (dust lockup guard)
+    MinShareSupply,
+    // Loss circuit breaker
+    LossCircuitBreakerThresholdBps,
+    LossCircuitBreakerBaseline,
+    LossCircuitBreakerTripped,
 }
 
 #[contracttype]
@@ -169,6 +179,14 @@ pub struct PendingWithdrawal {
     pub unlock_timestamp: u64,
 }
 
+#[contracttype]
+#[derive(Clone, Debug, Eq, PartialEq)]
+/// Tracks treasury withdrawals consumed in the current epoch window.
+pub struct TreasuryWithdrawEpochWindow {
+    pub epoch_id: u64,
+    pub withdrawn: i128,
+}
+
 #[contracterror]
 #[derive(Copy, Clone, Debug, Eq, PartialEq, PartialOrd, Ord)]
 #[repr(u32)]
@@ -196,6 +214,12 @@ pub enum VaultError {
     ExceedsStrategyCap = 10,
     /// Strategy allocation exceeds configured risk threshold.
     ExceedsRiskThreshold = 11,
+    /// Treasury withdrawal would exceed the per-epoch cap.
+    TreasuryWithdrawEpochCapExceeded = 12,
+    /// Withdrawal would leave total shares below the configured minimum.
+    MinShareSupplyViolated = 13,
+    /// Loss circuit breaker is tripped; sensitive operations are blocked.
+    CircuitBreakerTripped = 14,
 }
 
 #[contractclient(name = "KoreanDebtStrategyClient")]
@@ -694,6 +718,7 @@ impl YieldVault {
     /// ### Events
     /// Publishes a `(symbol_short!("deposit"),)` event with `(amount, shares_minted)`.
     pub fn deposit(env: Env, user: Address, amount: i128) -> Result<i128, VaultError> {
+        Self::assert_loss_circuit_breaker_ok(&env)?;
         let mut state = Self::get_state(&env);
         if state.is_paused {
             return Err(VaultError::ContractPaused);
@@ -797,6 +822,7 @@ impl YieldVault {
     /// ### Returns
     /// The quantity of underlying tokens returned to the user (0 if timelocked).
     pub fn withdraw(env: Env, user: Address, shares: i128) -> Result<i128, VaultError> {
+        Self::assert_loss_circuit_breaker_ok(&env)?;
         let mut state = Self::get_state(&env);
         if state.is_paused {
             return Err(VaultError::ContractPaused);
@@ -854,6 +880,7 @@ impl YieldVault {
 
     /// Completes a pending large withdrawal after the timelock has expired.
     pub fn execute_withdrawal(env: Env, user: Address) -> Result<i128, VaultError> {
+        Self::assert_loss_circuit_breaker_ok(&env)?;
         user.require_auth();
 
         let pending: PendingWithdrawal = env
@@ -893,6 +920,19 @@ impl YieldVault {
         shares: i128,
         assets_to_return: i128,
     ) -> Result<i128, VaultError> {
+        let min_supply: i128 = env
+            .storage()
+            .instance()
+            .get(&DataKey::MinShareSupply)
+            .unwrap_or(0);
+        let remaining_shares = state
+            .total_shares
+            .checked_sub(shares)
+            .expect("underflow");
+        if min_supply > 0 && remaining_shares > 0 && remaining_shares < min_supply {
+            return Err(VaultError::MinShareSupplyViolated);
+        }
+
         let token_addr = env.storage().instance().get(&DataKey::TokenAsset).unwrap();
         let token_client = token::Client::new(env, &token_addr);
 
@@ -962,6 +1002,7 @@ impl YieldVault {
 
     /// Move idle funds to the strategy.
     pub fn invest(env: Env, amount: i128) -> Result<(), VaultError> {
+        Self::assert_loss_circuit_breaker_ok(&env)?;
         let admin: Address = get_admin(&env).expect("Admin not set");
         admin.require_auth();
         if amount <= 0 {
@@ -1122,6 +1163,234 @@ impl YieldVault {
             .unwrap_or(0)
     }
 
+    /// Configure per-epoch treasury withdrawal cap (0 = unlimited within balance).
+    pub fn set_treasury_withdraw_epoch_cap(env: Env, cap: i128) {
+        let admin: Address = get_admin(&env).expect("Admin not set");
+        admin.require_auth();
+        if cap < 0 {
+            panic!("epoch cap must be >= 0");
+        }
+        let old_cap: i128 = env
+            .storage()
+            .instance()
+            .get(&DataKey::TreasuryWithdrawEpochCap)
+            .unwrap_or(0);
+        env.storage()
+            .instance()
+            .set(&DataKey::TreasuryWithdrawEpochCap, &cap);
+        env.events()
+            .publish((symbol_short!("trswdcap"),), (old_cap, cap));
+    }
+
+    pub fn treasury_withdraw_epoch_cap(env: Env) -> i128 {
+        env.storage()
+            .instance()
+            .get(&DataKey::TreasuryWithdrawEpochCap)
+            .unwrap_or(0)
+    }
+
+    /// Configure treasury withdrawal epoch length in seconds (0 disables epoch windows).
+    pub fn set_trs_wd_epoch_len(env: Env, duration_secs: u64) {
+        let admin: Address = get_admin(&env).expect("Admin not set");
+        admin.require_auth();
+        let old_duration: u64 = env
+            .storage()
+            .instance()
+            .get(&DataKey::TreasuryWithdrawEpochDuration)
+            .unwrap_or(0);
+        env.storage()
+            .instance()
+            .set(&DataKey::TreasuryWithdrawEpochDuration, &duration_secs);
+        env.events()
+            .publish((symbol_short!("trswdep"),), (old_duration, duration_secs));
+    }
+
+    pub fn trs_wd_epoch_len(env: Env) -> u64 {
+        env.storage()
+            .instance()
+            .get(&DataKey::TreasuryWithdrawEpochDuration)
+            .unwrap_or(0)
+    }
+
+    /// Withdraw accumulated protocol fees to the treasury address, rate-limited per epoch.
+    pub fn withdraw_treasury(env: Env, amount: i128) -> Result<(), VaultError> {
+        Self::assert_loss_circuit_breaker_ok(&env)?;
+        if amount <= 0 {
+            return Err(VaultError::InvalidAmount);
+        }
+
+        let treasury: Address = env
+            .storage()
+            .instance()
+            .get(&DataKey::Treasury)
+            .ok_or(VaultError::InvalidAmount)?;
+        treasury.require_auth();
+
+        let balance: i128 = env
+            .storage()
+            .instance()
+            .get(&DataKey::TreasuryBalance)
+            .unwrap_or(0);
+        if amount > balance {
+            return Err(VaultError::InvalidAmount);
+        }
+
+        Self::consume_treasury_withdraw_epoch_budget(&env, amount)?;
+
+        let token_addr = Self::token(env.clone());
+        let token_client = token::Client::new(&env, &token_addr);
+        token_client.transfer(&env.current_contract_address(), &treasury, &amount);
+
+        env.storage().instance().set(
+            &DataKey::TreasuryBalance,
+            &balance.checked_sub(amount).expect("underflow"),
+        );
+
+        let epoch_id = Self::current_treasury_withdraw_epoch(&env);
+        env.events()
+            .publish((symbol_short!("trswd"), treasury), (amount, epoch_id));
+        Ok(())
+    }
+
+    /// Set minimum total share supply; withdrawals cannot leave dust below this floor.
+    pub fn set_min_share_supply(env: Env, min_supply: i128) {
+        let admin: Address = get_admin(&env).expect("Admin not set");
+        admin.require_auth();
+        if min_supply < 0 {
+            panic!("min_share_supply must be >= 0");
+        }
+        let old_min: i128 = env
+            .storage()
+            .instance()
+            .get(&DataKey::MinShareSupply)
+            .unwrap_or(0);
+        env.storage()
+            .instance()
+            .set(&DataKey::MinShareSupply, &min_supply);
+        env.events()
+            .publish((symbol_short!("minshchg"),), (old_min, min_supply));
+    }
+
+    pub fn min_share_supply(env: Env) -> i128 {
+        env.storage()
+            .instance()
+            .get(&DataKey::MinShareSupply)
+            .unwrap_or(0)
+    }
+
+    /// Rebalance whitelisted strategies toward target balances in deterministic address order.
+    pub fn rebalance_strategies(
+        env: Env,
+        targets: Vec<(Address, i128)>,
+    ) -> Result<(), VaultError> {
+        Self::assert_loss_circuit_breaker_ok(&env)?;
+        let admin: Address = get_admin(&env).expect("Admin not set");
+        admin.require_auth();
+
+        let sorted = Self::sort_strategy_targets(&env, targets);
+
+        // Divest phase: process high-to-low address order (reverse of sorted invest order).
+        let mut idx = sorted.len();
+        while idx > 0 {
+            idx -= 1;
+            let (strategy, target) = sorted.get(idx).unwrap();
+            if !Self::is_strategy_whitelisted(env.clone(), strategy.clone()) {
+                panic!("strategy not whitelisted");
+            }
+            let current = StrategyClient::new(&env, &strategy).total_value();
+            if current > target {
+                let delta = current.checked_sub(target).expect("underflow");
+                Self::divest_from_strategy(env.clone(), strategy.clone(), delta);
+            }
+        }
+
+        // Invest phase: ascending address order.
+        let mut invest_idx = 0;
+        while invest_idx < sorted.len() {
+            let (strategy, target) = sorted.get(invest_idx).unwrap();
+            let current = StrategyClient::new(&env, &strategy).total_value();
+            if current < target {
+                let delta = target.checked_sub(current).expect("underflow");
+                Self::invest_to_strategy(env.clone(), strategy.clone(), delta)?;
+            }
+            invest_idx += 1;
+        }
+
+        env.events()
+            .publish((symbol_short!("rebal"),), sorted.len());
+        Ok(())
+    }
+
+    /// Set abnormal-loss circuit breaker threshold in basis points (0 disables).
+    pub fn set_cb_loss_thresh(env: Env, threshold_bps: i128) {
+        let admin: Address = get_admin(&env).expect("Admin not set");
+        admin.require_auth();
+        if threshold_bps < 0 || threshold_bps > 10_000 {
+            panic!("threshold must be 0-10000");
+        }
+        let old_bps: i128 = env
+            .storage()
+            .instance()
+            .get(&DataKey::LossCircuitBreakerThresholdBps)
+            .unwrap_or(0);
+        env.storage()
+            .instance()
+            .set(&DataKey::LossCircuitBreakerThresholdBps, &threshold_bps);
+        env.events()
+            .publish((symbol_short!("cb_thr"),), (old_bps, threshold_bps));
+    }
+
+    pub fn cb_loss_thresh_bps(env: Env) -> i128 {
+        env.storage()
+            .instance()
+            .get(&DataKey::LossCircuitBreakerThresholdBps)
+            .unwrap_or(0)
+    }
+
+    /// Snapshot current total assets as the circuit-breaker baseline.
+    pub fn set_cb_loss_baseline(env: Env) {
+        let admin: Address = get_admin(&env).expect("Admin not set");
+        admin.require_auth();
+        let baseline = Self::total_assets(env.clone());
+        env.storage()
+            .instance()
+            .set(&DataKey::LossCircuitBreakerBaseline, &baseline);
+        env.storage()
+            .instance()
+            .set(&DataKey::LossCircuitBreakerTripped, &false);
+        env.events()
+            .publish((symbol_short!("cb_base"),), baseline);
+    }
+
+    pub fn cb_loss_baseline(env: Env) -> i128 {
+        env.storage()
+            .instance()
+            .get(&DataKey::LossCircuitBreakerBaseline)
+            .unwrap_or(0)
+    }
+
+    pub fn is_cb_loss_tripped(env: Env) -> bool {
+        env.storage()
+            .instance()
+            .get(&DataKey::LossCircuitBreakerTripped)
+            .unwrap_or(false)
+    }
+
+    /// Admin reset after investigating an abnormal loss trip.
+    pub fn reset_cb_loss(env: Env) {
+        let admin: Address = get_admin(&env).expect("Admin not set");
+        admin.require_auth();
+        env.storage()
+            .instance()
+            .set(&DataKey::LossCircuitBreakerTripped, &false);
+        env.events().publish((symbol_short!("cb_rst"),), ());
+    }
+
+    /// Evaluate total assets against baseline; trip breaker when loss exceeds threshold.
+    pub fn eval_cb_loss(env: Env) -> Result<(), VaultError> {
+        Self::evaluate_loss_circuit_breaker_internal(&env)
+    }
+
     // ── Goal 2: Large-withdrawal timelock ────────────────────────────────────
 
     /// Set the threshold above which withdrawals require a 24-hour timelock.
@@ -1299,6 +1568,230 @@ impl YieldVault {
         env.storage().instance().set(&DataKey::State, &state);
     }
 
+    fn current_treasury_withdraw_epoch(env: &Env) -> u64 {
+        let duration: u64 = env
+            .storage()
+            .instance()
+            .get(&DataKey::TreasuryWithdrawEpochDuration)
+            .unwrap_or(0);
+        if duration == 0 {
+            return 0;
+        }
+        env.ledger().timestamp() / duration
+    }
+
+    fn consume_treasury_withdraw_epoch_budget(env: &Env, amount: i128) -> Result<(), VaultError> {
+        let cap: i128 = env
+            .storage()
+            .instance()
+            .get(&DataKey::TreasuryWithdrawEpochCap)
+            .unwrap_or(0);
+        let duration: u64 = env
+            .storage()
+            .instance()
+            .get(&DataKey::TreasuryWithdrawEpochDuration)
+            .unwrap_or(0);
+        if cap == 0 || duration == 0 {
+            return Ok(());
+        }
+
+        let epoch_id = Self::current_treasury_withdraw_epoch(env);
+        let mut window: TreasuryWithdrawEpochWindow = env
+            .storage()
+            .instance()
+            .get(&DataKey::TreasuryWithdrawEpochWindow)
+            .unwrap_or(TreasuryWithdrawEpochWindow {
+                epoch_id,
+                withdrawn: 0,
+            });
+
+        if window.epoch_id != epoch_id {
+            window = TreasuryWithdrawEpochWindow {
+                epoch_id,
+                withdrawn: 0,
+            };
+        }
+
+        let new_withdrawn = window
+            .withdrawn
+            .checked_add(amount)
+            .expect("overflow");
+        if new_withdrawn > cap {
+            return Err(VaultError::TreasuryWithdrawEpochCapExceeded);
+        }
+
+        window.withdrawn = new_withdrawn;
+        env.storage()
+            .instance()
+            .set(&DataKey::TreasuryWithdrawEpochWindow, &window);
+        Ok(())
+    }
+
+    fn assert_loss_circuit_breaker_ok(env: &Env) -> Result<(), VaultError> {
+        if env
+            .storage()
+            .instance()
+            .get(&DataKey::LossCircuitBreakerTripped)
+            .unwrap_or(false)
+        {
+            return Err(VaultError::CircuitBreakerTripped);
+        }
+        Self::evaluate_loss_circuit_breaker_internal(env)
+    }
+
+    fn evaluate_loss_circuit_breaker_internal(env: &Env) -> Result<(), VaultError> {
+        let threshold_bps: i128 = env
+            .storage()
+            .instance()
+            .get(&DataKey::LossCircuitBreakerThresholdBps)
+            .unwrap_or(0);
+        if threshold_bps == 0 {
+            return Ok(());
+        }
+
+        let baseline: i128 = env
+            .storage()
+            .instance()
+            .get(&DataKey::LossCircuitBreakerBaseline)
+            .unwrap_or(0);
+        if baseline <= 0 {
+            return Ok(());
+        }
+
+        let current = Self::total_assets(env.clone());
+        if current >= baseline {
+            return Ok(());
+        }
+
+        let loss = baseline.checked_sub(current).expect("underflow");
+        let loss_bps = loss
+            .checked_mul(10_000)
+            .expect("overflow")
+            .checked_div(baseline)
+            .expect("division by zero");
+        if loss_bps >= threshold_bps {
+            env.storage()
+                .instance()
+                .set(&DataKey::LossCircuitBreakerTripped, &true);
+            env.events()
+                .publish((symbol_short!("cb_trip"),), (baseline, current, loss_bps));
+            return Err(VaultError::CircuitBreakerTripped);
+        }
+
+        Ok(())
+    }
+
+    fn strategy_address_lt(a: &Address, b: &Address) -> bool {
+        a < b
+    }
+
+    fn sort_strategy_targets(env: &Env, targets: Vec<(Address, i128)>) -> Vec<(Address, i128)> {
+        let mut sorted = Vec::new(env);
+        let mut i = 0;
+        while i < targets.len() {
+            sorted.push_back(targets.get(i).unwrap());
+            i += 1;
+        }
+
+        let len = sorted.len();
+        if len < 2 {
+            return sorted;
+        }
+
+        let mut outer = 0;
+        while outer < len {
+            let mut inner = outer + 1;
+            while inner < len {
+                let left = sorted.get(outer).unwrap();
+                let right = sorted.get(inner).unwrap();
+                if Self::strategy_address_lt(&right.0, &left.0) {
+                    sorted.set(outer, right.clone());
+                    sorted.set(inner, left);
+                }
+                inner += 1;
+            }
+            outer += 1;
+        }
+
+        sorted
+    }
+
+    fn invest_to_strategy(env: Env, strategy_addr: Address, amount: i128) -> Result<(), VaultError> {
+        if amount <= 0 {
+            return Ok(());
+        }
+
+        let strategy_client = StrategyClient::new(&env, &strategy_addr);
+        let cap: i128 = env
+            .storage()
+            .instance()
+            .get(&DataKey::StrategyCap(strategy_addr.clone()))
+            .unwrap_or(i128::MAX);
+        let total_invested = strategy_client.total_value();
+        if total_invested.checked_add(amount).expect("overflow") > cap {
+            return Err(VaultError::ExceedsStrategyCap);
+        }
+
+        let threshold: i128 = env
+            .storage()
+            .instance()
+            .get(&DataKey::StrategyRiskThreshold(strategy_addr.clone()))
+            .unwrap_or(10_000);
+        let total_assets = Self::total_assets(env.clone());
+        let new_total_invested = total_invested.checked_add(amount).expect("overflow");
+        if total_assets > 0
+            && (new_total_invested.checked_mul(10_000).expect("overflow") / total_assets) > threshold
+        {
+            return Err(VaultError::ExceedsRiskThreshold);
+        }
+
+        let idle_ta = env
+            .storage()
+            .instance()
+            .get::<_, i128>(&DataKey::TotalAssets)
+            .unwrap_or(0);
+        if idle_ta < amount {
+            panic!("insufficient idle assets");
+        }
+        let remaining_idle = idle_ta.checked_sub(amount).expect("underflow");
+        if remaining_idle < Self::min_liquidity_buffer(env.clone()) {
+            return Err(VaultError::LiquidityBufferNotMet);
+        }
+
+        let token_addr = Self::token(env.clone());
+        let token_client = token::Client::new(&env, &token_addr);
+        token_client.approve(
+            &env.current_contract_address(),
+            &strategy_addr,
+            &amount,
+            &env.ledger().sequence(),
+        );
+
+        strategy_client.deposit(&amount);
+        env.storage()
+            .instance()
+            .set(&DataKey::TotalAssets, &remaining_idle);
+        Ok(())
+    }
+
+    fn divest_from_strategy(env: Env, strategy_addr: Address, amount: i128) {
+        if amount <= 0 {
+            return;
+        }
+        let strategy_client = StrategyClient::new(&env, &strategy_addr);
+        strategy_client.withdraw(&amount);
+
+        let idle_ta = env
+            .storage()
+            .instance()
+            .get::<_, i128>(&DataKey::TotalAssets)
+            .unwrap_or(0);
+        env.storage().instance().set(
+            &DataKey::TotalAssets,
+            &idle_ta.checked_add(amount).expect("overflow"),
+        );
+    }
+
     fn insert_sorted_unique(env: &Env, ids: Vec<u64>, shipment_id: u64) -> Vec<u64> {
         let mut out = Vec::new(env);
         let mut inserted = false;
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.1.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.1.json
index 82186371..d308991b 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.1.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.1.json
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -428,6 +432,24 @@
                             "lo": 467886
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 467886
+                          }
+                        }
                       }
                     ]
                   }
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.10.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.10.json
index 42dde7a1..f6fa97f4 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.10.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.10.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 321324
+                    "lo": 651428
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 776454
+                    "lo": 28207
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 321324
+                    "lo": 651428
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 321324
+                        "lo": 651428
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 321324
+                            "lo": 651428
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 321324
+                                  "lo": 651428
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 321324
+                                  "lo": 651428
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 321324
+                            "lo": 651428
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 321324
+                            "lo": 651428
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 651428
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 321324
+                          "lo": 651428
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 776454
+                          "lo": 28207
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.100.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.100.json
index f77db195..c9a6617d 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.100.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.100.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 979279
+                    "lo": 907700
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 476789
+                    "lo": 826580
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 979279
+                    "lo": 907700
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 979279
+                        "lo": 907700
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 979279
+                            "lo": 907700
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 979279
+                                  "lo": 907700
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 979279
+                                  "lo": 907700
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 979279
+                            "lo": 907700
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 979279
+                            "lo": 907700
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 907700
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 979279
+                          "lo": 907700
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 476789
+                          "lo": 826580
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.101.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.101.json
index 6d805b69..c7c3285e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.101.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.101.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 962270
+                    "lo": 574833
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 97328
+                    "lo": 208383
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 962270
+                    "lo": 574833
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 962270
+                        "lo": 574833
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 962270
+                            "lo": 574833
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 962270
+                                  "lo": 574833
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 962270
+                                  "lo": 574833
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 962270
+                            "lo": 574833
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 962270
+                            "lo": 574833
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 574833
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 962270
+                          "lo": 574833
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 97328
+                          "lo": 208383
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.102.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.102.json
index ef8a658b..779b80d6 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.102.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.102.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 948472
+                    "lo": 239742
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 145977
+                    "lo": 876685
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 948472
+                    "lo": 239742
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 948472
+                        "lo": 239742
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 948472
+                            "lo": 239742
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 948472
+                                  "lo": 239742
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 948472
+                                  "lo": 239742
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 948472
+                            "lo": 239742
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 948472
+                            "lo": 239742
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 239742
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 948472
+                          "lo": 239742
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 145977
+                          "lo": 876685
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.103.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.103.json
index 49e09ce0..bb3814f4 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.103.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.103.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 963051
+                    "lo": 57106
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 3347
+                    "lo": 99947
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 963051
+                    "lo": 57106
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 963051
+                        "lo": 57106
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 963051
+                            "lo": 57106
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 963051
+                                  "lo": 57106
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 963051
+                                  "lo": 57106
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 963051
+                            "lo": 57106
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 963051
+                            "lo": 57106
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 57106
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 963051
+                          "lo": 57106
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 3347
+                          "lo": 99947
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.104.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.104.json
index d3b2708e..5b3b60ac 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.104.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.104.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 385184
+                    "lo": 735510
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 733654
+                    "lo": 399221
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 385184
+                    "lo": 735510
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 385184
+                        "lo": 735510
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 385184
+                            "lo": 735510
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 385184
+                                  "lo": 735510
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 385184
+                                  "lo": 735510
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 385184
+                            "lo": 735510
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 385184
+                            "lo": 735510
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 735510
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 385184
+                          "lo": 735510
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 733654
+                          "lo": 399221
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.105.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.105.json
index 1ab20b81..0f30f3cf 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.105.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.105.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 364675
+                    "lo": 658838
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 520385
+                    "lo": 961500
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 364675
+                    "lo": 658838
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 364675
+                        "lo": 658838
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 364675
+                            "lo": 658838
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 364675
+                                  "lo": 658838
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 364675
+                                  "lo": 658838
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 364675
+                            "lo": 658838
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 364675
+                            "lo": 658838
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 658838
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 364675
+                          "lo": 658838
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 520385
+                          "lo": 961500
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.106.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.106.json
index 2e398592..63de848e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.106.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.106.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 283461
+                    "lo": 344918
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 267737
+                    "lo": 260515
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 283461
+                    "lo": 344918
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 283461
+                        "lo": 344918
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 283461
+                            "lo": 344918
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 283461
+                                  "lo": 344918
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 283461
+                                  "lo": 344918
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 283461
+                            "lo": 344918
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 283461
+                            "lo": 344918
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 344918
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 283461
+                          "lo": 344918
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 267737
+                          "lo": 260515
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.107.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.107.json
index 457f8a07..31879780 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.107.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.107.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 13799
+                    "lo": 635179
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 919107
+                    "lo": 236192
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 13799
+                    "lo": 635179
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 13799
+                        "lo": 635179
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 13799
+                            "lo": 635179
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 13799
+                                  "lo": 635179
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 13799
+                                  "lo": 635179
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 13799
+                            "lo": 635179
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 13799
+                            "lo": 635179
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 635179
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 13799
+                          "lo": 635179
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 919107
+                          "lo": 236192
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.108.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.108.json
index f369aea0..30d443de 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.108.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.108.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 732701
+                    "lo": 736818
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 593030
+                    "lo": 172948
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 732701
+                    "lo": 736818
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 732701
+                        "lo": 736818
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 732701
+                            "lo": 736818
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 732701
+                                  "lo": 736818
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 732701
+                                  "lo": 736818
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 732701
+                            "lo": 736818
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 732701
+                            "lo": 736818
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 736818
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 732701
+                          "lo": 736818
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 593030
+                          "lo": 172948
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.109.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.109.json
index a7ac052e..673ab03b 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.109.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.109.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 121651
+                    "lo": 833687
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 392285
+                    "lo": 54757
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 121651
+                    "lo": 833687
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 121651
+                        "lo": 833687
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 121651
+                            "lo": 833687
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 121651
+                                  "lo": 833687
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 121651
+                                  "lo": 833687
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 121651
+                            "lo": 833687
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 121651
+                            "lo": 833687
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 833687
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 121651
+                          "lo": 833687
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 392285
+                          "lo": 54757
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.11.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.11.json
index ef096f49..c2a3e7c1 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.11.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.11.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 696164
+                    "lo": 357433
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 138584
+                    "lo": 447586
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 696164
+                    "lo": 357433
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 696164
+                        "lo": 357433
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 696164
+                            "lo": 357433
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 696164
+                                  "lo": 357433
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 696164
+                                  "lo": 357433
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 696164
+                            "lo": 357433
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 696164
+                            "lo": 357433
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 357433
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 696164
+                          "lo": 357433
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 138584
+                          "lo": 447586
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.110.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.110.json
index aff63d16..7980e807 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.110.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.110.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 659443
+                    "lo": 226347
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 421504
+                    "lo": 717353
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 659443
+                    "lo": 226347
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 659443
+                        "lo": 226347
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 659443
+                            "lo": 226347
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 659443
+                                  "lo": 226347
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 659443
+                                  "lo": 226347
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 659443
+                            "lo": 226347
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 659443
+                            "lo": 226347
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 226347
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 659443
+                          "lo": 226347
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 421504
+                          "lo": 717353
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.111.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.111.json
index 4d2e6a7d..fc5104d0 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.111.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.111.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 951461
+                    "lo": 40494
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 489670
+                    "lo": 187775
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 951461
+                    "lo": 40494
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 951461
+                        "lo": 40494
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 951461
+                            "lo": 40494
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 951461
+                                  "lo": 40494
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 951461
+                                  "lo": 40494
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 951461
+                            "lo": 40494
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 951461
+                            "lo": 40494
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 40494
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 951461
+                          "lo": 40494
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 489670
+                          "lo": 187775
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.112.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.112.json
index 432cf90b..5dc8d47e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.112.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.112.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 192594
+                    "lo": 352345
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 818049
+                    "lo": 669333
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 192594
+                    "lo": 352345
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 192594
+                        "lo": 352345
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 192594
+                            "lo": 352345
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 192594
+                                  "lo": 352345
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 192594
+                                  "lo": 352345
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 192594
+                            "lo": 352345
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 192594
+                            "lo": 352345
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 352345
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 192594
+                          "lo": 352345
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 818049
+                          "lo": 669333
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.113.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.113.json
index 365064f3..3ad06bda 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.113.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.113.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 291061
+                    "lo": 108467
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 430938
+                    "lo": 294232
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 291061
+                    "lo": 108467
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 291061
+                        "lo": 108467
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 291061
+                            "lo": 108467
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 291061
+                                  "lo": 108467
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 291061
+                                  "lo": 108467
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 291061
+                            "lo": 108467
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 291061
+                            "lo": 108467
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 108467
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 291061
+                          "lo": 108467
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 430938
+                          "lo": 294232
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.114.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.114.json
index 0bd53fa8..beb1acdc 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.114.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.114.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 165545
+                    "lo": 514371
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 582461
+                    "lo": 59092
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 165545
+                    "lo": 514371
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 165545
+                        "lo": 514371
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 165545
+                            "lo": 514371
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 165545
+                                  "lo": 514371
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 165545
+                                  "lo": 514371
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 165545
+                            "lo": 514371
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 165545
+                            "lo": 514371
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 514371
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 165545
+                          "lo": 514371
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 582461
+                          "lo": 59092
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.115.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.115.json
index b581aea5..2ff1c040 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.115.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.115.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 316614
+                    "lo": 53284
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 627218
+                    "lo": 185986
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 316614
+                    "lo": 53284
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 316614
+                        "lo": 53284
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 316614
+                            "lo": 53284
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 316614
+                                  "lo": 53284
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 316614
+                                  "lo": 53284
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 316614
+                            "lo": 53284
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 316614
+                            "lo": 53284
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 53284
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 316614
+                          "lo": 53284
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 627218
+                          "lo": 185986
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.116.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.116.json
index 87227600..1034639a 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.116.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.116.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 409846
+                    "lo": 94007
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 167941
+                    "lo": 117912
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 409846
+                    "lo": 94007
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 409846
+                        "lo": 94007
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 409846
+                            "lo": 94007
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 409846
+                                  "lo": 94007
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 409846
+                                  "lo": 94007
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 409846
+                            "lo": 94007
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 409846
+                            "lo": 94007
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 94007
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 409846
+                          "lo": 94007
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 167941
+                          "lo": 117912
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.117.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.117.json
index b095f068..77bd6eaa 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.117.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.117.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 361373
+                    "lo": 449689
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 943404
+                    "lo": 946113
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 361373
+                    "lo": 449689
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 361373
+                        "lo": 449689
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 361373
+                            "lo": 449689
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 361373
+                                  "lo": 449689
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 361373
+                                  "lo": 449689
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 361373
+                            "lo": 449689
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 361373
+                            "lo": 449689
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 449689
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 361373
+                          "lo": 449689
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 943404
+                          "lo": 946113
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.118.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.118.json
index 4a48ad2a..ebfb3503 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.118.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.118.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 239310
+                    "lo": 239575
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 693919
+                    "lo": 131606
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 239310
+                    "lo": 239575
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 239310
+                        "lo": 239575
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 239310
+                            "lo": 239575
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 239310
+                                  "lo": 239575
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 239310
+                                  "lo": 239575
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 239310
+                            "lo": 239575
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 239310
+                            "lo": 239575
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 239575
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 239310
+                          "lo": 239575
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 693919
+                          "lo": 131606
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.119.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.119.json
index 50e8accf..a59b250c 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.119.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.119.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 298246
+                    "lo": 154132
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 43171
+                    "lo": 604046
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 298246
+                    "lo": 154132
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 298246
+                        "lo": 154132
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 298246
+                            "lo": 154132
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 298246
+                                  "lo": 154132
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 298246
+                                  "lo": 154132
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 298246
+                            "lo": 154132
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 298246
+                            "lo": 154132
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 154132
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 298246
+                          "lo": 154132
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 43171
+                          "lo": 604046
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.12.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.12.json
index 736d5b0c..a4f3e611 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.12.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.12.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 409364
+                    "lo": 846273
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 508947
+                    "lo": 416660
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 409364
+                    "lo": 846273
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 409364
+                        "lo": 846273
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 409364
+                            "lo": 846273
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 409364
+                                  "lo": 846273
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 409364
+                                  "lo": 846273
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 409364
+                            "lo": 846273
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 409364
+                            "lo": 846273
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 846273
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 409364
+                          "lo": 846273
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 508947
+                          "lo": 416660
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.120.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.120.json
index f82c6eac..952ffc03 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.120.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.120.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 96647
+                    "lo": 120536
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 534897
+                    "lo": 461443
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 96647
+                    "lo": 120536
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 96647
+                        "lo": 120536
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 96647
+                            "lo": 120536
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 96647
+                                  "lo": 120536
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 96647
+                                  "lo": 120536
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 96647
+                            "lo": 120536
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 96647
+                            "lo": 120536
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 120536
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 96647
+                          "lo": 120536
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 534897
+                          "lo": 461443
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.121.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.121.json
index ecc9f640..d9bb30c9 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.121.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.121.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 355722
+                    "lo": 254543
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 657634
+                    "lo": 498752
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 355722
+                    "lo": 254543
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 355722
+                        "lo": 254543
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 355722
+                            "lo": 254543
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 355722
+                                  "lo": 254543
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 355722
+                                  "lo": 254543
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 355722
+                            "lo": 254543
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 355722
+                            "lo": 254543
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 254543
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 355722
+                          "lo": 254543
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 657634
+                          "lo": 498752
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.122.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.122.json
index f27cf84e..6c8435d9 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.122.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.122.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 702169
+                    "lo": 615145
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 335266
+                    "lo": 894707
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 702169
+                    "lo": 615145
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 702169
+                        "lo": 615145
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 702169
+                            "lo": 615145
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 702169
+                                  "lo": 615145
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 702169
+                                  "lo": 615145
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 702169
+                            "lo": 615145
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 702169
+                            "lo": 615145
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 615145
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 702169
+                          "lo": 615145
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 335266
+                          "lo": 894707
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.123.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.123.json
index 99d299de..133ad5c7 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.123.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.123.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 361276
+                    "lo": 137644
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 402097
+                    "lo": 817451
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 361276
+                    "lo": 137644
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 361276
+                        "lo": 137644
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 361276
+                            "lo": 137644
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 361276
+                                  "lo": 137644
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 361276
+                                  "lo": 137644
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 361276
+                            "lo": 137644
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 361276
+                            "lo": 137644
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 137644
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 361276
+                          "lo": 137644
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 402097
+                          "lo": 817451
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.124.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.124.json
index 986262a0..3cb3d367 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.124.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.124.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 135991
+                    "lo": 841661
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 574024
+                    "lo": 830650
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 135991
+                    "lo": 841661
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 135991
+                        "lo": 841661
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 135991
+                            "lo": 841661
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 135991
+                                  "lo": 841661
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 135991
+                                  "lo": 841661
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 135991
+                            "lo": 841661
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 135991
+                            "lo": 841661
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 841661
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 135991
+                          "lo": 841661
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 574024
+                          "lo": 830650
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.125.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.125.json
index d992fbf0..140fb2e3 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.125.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.125.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 72028
+                    "lo": 990278
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 116667
+                    "lo": 824798
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 72028
+                    "lo": 990278
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 72028
+                        "lo": 990278
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 72028
+                            "lo": 990278
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 72028
+                                  "lo": 990278
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 72028
+                                  "lo": 990278
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 72028
+                            "lo": 990278
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 72028
+                            "lo": 990278
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 990278
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 72028
+                          "lo": 990278
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 116667
+                          "lo": 824798
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.126.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.126.json
index ed16629a..1f872279 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.126.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.126.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 272993
+                    "lo": 349156
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 982734
+                    "lo": 248292
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 272993
+                    "lo": 349156
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 272993
+                        "lo": 349156
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 272993
+                            "lo": 349156
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 272993
+                                  "lo": 349156
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 272993
+                                  "lo": 349156
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 272993
+                            "lo": 349156
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 272993
+                            "lo": 349156
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 349156
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 272993
+                          "lo": 349156
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 982734
+                          "lo": 248292
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.127.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.127.json
index c363fef2..3744bfff 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.127.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.127.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 106045
+                    "lo": 498523
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 268714
+                    "lo": 184016
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 106045
+                    "lo": 498523
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 106045
+                        "lo": 498523
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 106045
+                            "lo": 498523
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 106045
+                                  "lo": 498523
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 106045
+                                  "lo": 498523
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 106045
+                            "lo": 498523
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 106045
+                            "lo": 498523
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 498523
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 106045
+                          "lo": 498523
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 268714
+                          "lo": 184016
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.128.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.128.json
index cdf6645b..c2615b35 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.128.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.128.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 559031
+                    "lo": 217042
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 208731
+                    "lo": 301512
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 559031
+                    "lo": 217042
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 559031
+                        "lo": 217042
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 559031
+                            "lo": 217042
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 559031
+                                  "lo": 217042
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 559031
+                                  "lo": 217042
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 559031
+                            "lo": 217042
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 559031
+                            "lo": 217042
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 217042
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 559031
+                          "lo": 217042
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 208731
+                          "lo": 301512
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.129.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.129.json
index 18caef94..a4ca0e7f 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.129.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.129.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 463290
+                    "lo": 614154
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 243607
+                    "lo": 562138
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 463290
+                    "lo": 614154
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 463290
+                        "lo": 614154
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 463290
+                            "lo": 614154
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 463290
+                                  "lo": 614154
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 463290
+                                  "lo": 614154
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 463290
+                            "lo": 614154
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 463290
+                            "lo": 614154
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 614154
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 463290
+                          "lo": 614154
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 243607
+                          "lo": 562138
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.13.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.13.json
index bc6f7bcc..2186f6b7 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.13.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.13.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 473266
+                    "lo": 80121
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 319563
+                    "lo": 706712
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 473266
+                    "lo": 80121
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 473266
+                        "lo": 80121
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 473266
+                            "lo": 80121
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 473266
+                                  "lo": 80121
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 473266
+                                  "lo": 80121
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 473266
+                            "lo": 80121
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 473266
+                            "lo": 80121
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 80121
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 473266
+                          "lo": 80121
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 319563
+                          "lo": 706712
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.130.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.130.json
index 4b8a815d..c197d039 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.130.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.130.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 398367
+                    "lo": 6566
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 908013
+                    "lo": 609938
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 398367
+                    "lo": 6566
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 398367
+                        "lo": 6566
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 398367
+                            "lo": 6566
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 398367
+                                  "lo": 6566
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 398367
+                                  "lo": 6566
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 398367
+                            "lo": 6566
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 398367
+                            "lo": 6566
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 6566
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 398367
+                          "lo": 6566
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 908013
+                          "lo": 609938
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.131.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.131.json
index f17b9777..70438b8a 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.131.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.131.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 810490
+                    "lo": 226544
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 67033
+                    "lo": 216482
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 810490
+                    "lo": 226544
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 810490
+                        "lo": 226544
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 810490
+                            "lo": 226544
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 810490
+                                  "lo": 226544
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 810490
+                                  "lo": 226544
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 810490
+                            "lo": 226544
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 810490
+                            "lo": 226544
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 226544
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 810490
+                          "lo": 226544
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 67033
+                          "lo": 216482
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.132.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.132.json
index fc893625..5e552fa0 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.132.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.132.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 406547
+                    "lo": 826205
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 51917
+                    "lo": 161751
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 406547
+                    "lo": 826205
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 406547
+                        "lo": 826205
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 406547
+                            "lo": 826205
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 406547
+                                  "lo": 826205
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 406547
+                                  "lo": 826205
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 406547
+                            "lo": 826205
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 406547
+                            "lo": 826205
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 826205
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 406547
+                          "lo": 826205
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 51917
+                          "lo": 161751
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.133.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.133.json
index 80770426..34b6d27e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.133.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.133.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 167321
+                    "lo": 292781
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 83230
+                    "lo": 579522
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 167321
+                    "lo": 292781
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 167321
+                        "lo": 292781
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 167321
+                            "lo": 292781
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 167321
+                                  "lo": 292781
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 167321
+                                  "lo": 292781
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 167321
+                            "lo": 292781
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 167321
+                            "lo": 292781
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 292781
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 167321
+                          "lo": 292781
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 83230
+                          "lo": 579522
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.134.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.134.json
index 3a825fe4..5d8d42f8 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.134.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.134.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 990066
+                    "lo": 800519
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 45780
+                    "lo": 819410
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 990066
+                    "lo": 800519
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 990066
+                        "lo": 800519
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 990066
+                            "lo": 800519
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 990066
+                                  "lo": 800519
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 990066
+                                  "lo": 800519
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 990066
+                            "lo": 800519
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 990066
+                            "lo": 800519
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 800519
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 990066
+                          "lo": 800519
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 45780
+                          "lo": 819410
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.135.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.135.json
index c43d52ec..aa0aa03a 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.135.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.135.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 462674
+                    "lo": 959877
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 56360
+                    "lo": 473219
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 462674
+                    "lo": 959877
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 462674
+                        "lo": 959877
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 462674
+                            "lo": 959877
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 462674
+                                  "lo": 959877
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 462674
+                                  "lo": 959877
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 462674
+                            "lo": 959877
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 462674
+                            "lo": 959877
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 959877
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 462674
+                          "lo": 959877
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 56360
+                          "lo": 473219
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.136.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.136.json
index 65231951..56ccf68c 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.136.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.136.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 294875
+                    "lo": 254218
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 761243
+                    "lo": 961864
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 294875
+                    "lo": 254218
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 294875
+                        "lo": 254218
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 294875
+                            "lo": 254218
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 294875
+                                  "lo": 254218
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 294875
+                                  "lo": 254218
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 294875
+                            "lo": 254218
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 294875
+                            "lo": 254218
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 254218
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 294875
+                          "lo": 254218
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 761243
+                          "lo": 961864
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.137.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.137.json
index dbb2b668..1c0be77b 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.137.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.137.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 415782
+                    "lo": 995477
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 784122
+                    "lo": 53506
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 415782
+                    "lo": 995477
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 415782
+                        "lo": 995477
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 415782
+                            "lo": 995477
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 415782
+                                  "lo": 995477
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 415782
+                                  "lo": 995477
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 415782
+                            "lo": 995477
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 415782
+                            "lo": 995477
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 995477
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 415782
+                          "lo": 995477
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 784122
+                          "lo": 53506
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.138.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.138.json
index e4deb515..809995a4 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.138.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.138.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 444091
+                    "lo": 744888
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 513336
+                    "lo": 224929
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 444091
+                    "lo": 744888
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 444091
+                        "lo": 744888
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 444091
+                            "lo": 744888
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 444091
+                                  "lo": 744888
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 444091
+                                  "lo": 744888
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 444091
+                            "lo": 744888
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 444091
+                            "lo": 744888
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 744888
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 444091
+                          "lo": 744888
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 513336
+                          "lo": 224929
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.139.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.139.json
index c46f80b1..5fdf3eac 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.139.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.139.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 834595
+                    "lo": 823325
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 812564
+                    "lo": 589772
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 834595
+                    "lo": 823325
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 834595
+                        "lo": 823325
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 834595
+                            "lo": 823325
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 834595
+                                  "lo": 823325
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 834595
+                                  "lo": 823325
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 834595
+                            "lo": 823325
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 834595
+                            "lo": 823325
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 823325
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 834595
+                          "lo": 823325
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 812564
+                          "lo": 589772
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.14.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.14.json
index a3fab371..a98402df 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.14.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.14.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 542700
+                    "lo": 107448
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 536474
+                    "lo": 327141
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 542700
+                    "lo": 107448
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 542700
+                        "lo": 107448
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 542700
+                            "lo": 107448
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 542700
+                                  "lo": 107448
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 542700
+                                  "lo": 107448
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 542700
+                            "lo": 107448
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 542700
+                            "lo": 107448
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 107448
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 542700
+                          "lo": 107448
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 536474
+                          "lo": 327141
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.140.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.140.json
index b0e2ae07..7cdacbaf 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.140.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.140.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 783965
+                    "lo": 142610
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 324967
+                    "lo": 773124
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 783965
+                    "lo": 142610
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 783965
+                        "lo": 142610
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 783965
+                            "lo": 142610
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 783965
+                                  "lo": 142610
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 783965
+                                  "lo": 142610
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 783965
+                            "lo": 142610
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 783965
+                            "lo": 142610
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 142610
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 783965
+                          "lo": 142610
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 324967
+                          "lo": 773124
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.141.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.141.json
index d40dcd95..b473fb07 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.141.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.141.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 926723
+                    "lo": 32945
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 121603
+                    "lo": 786813
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 926723
+                    "lo": 32945
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 926723
+                        "lo": 32945
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 926723
+                            "lo": 32945
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 926723
+                                  "lo": 32945
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 926723
+                                  "lo": 32945
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 926723
+                            "lo": 32945
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 926723
+                            "lo": 32945
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 32945
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 926723
+                          "lo": 32945
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 121603
+                          "lo": 786813
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.142.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.142.json
index 61a7be46..b3d8e57d 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.142.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.142.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 929773
+                    "lo": 384357
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 290268
+                    "lo": 298978
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 929773
+                    "lo": 384357
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 929773
+                        "lo": 384357
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 929773
+                            "lo": 384357
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 929773
+                                  "lo": 384357
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 929773
+                                  "lo": 384357
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 929773
+                            "lo": 384357
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 929773
+                            "lo": 384357
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 384357
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 929773
+                          "lo": 384357
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 290268
+                          "lo": 298978
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.143.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.143.json
index 85979647..2c4ae93c 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.143.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.143.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 976780
+                    "lo": 308614
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 109949
+                    "lo": 132926
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 976780
+                    "lo": 308614
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 976780
+                        "lo": 308614
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 976780
+                            "lo": 308614
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 976780
+                                  "lo": 308614
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 976780
+                                  "lo": 308614
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 976780
+                            "lo": 308614
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 976780
+                            "lo": 308614
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 308614
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 976780
+                          "lo": 308614
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 109949
+                          "lo": 132926
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.144.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.144.json
index 465bee02..7b823494 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.144.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.144.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 218630
+                    "lo": 228350
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 921963
+                    "lo": 366923
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 218630
+                    "lo": 228350
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 218630
+                        "lo": 228350
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 218630
+                            "lo": 228350
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 218630
+                                  "lo": 228350
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 218630
+                                  "lo": 228350
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 218630
+                            "lo": 228350
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 218630
+                            "lo": 228350
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 228350
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 218630
+                          "lo": 228350
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 921963
+                          "lo": 366923
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.145.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.145.json
index a64d25bb..82b978b3 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.145.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.145.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 894084
+                    "lo": 864707
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 342061
+                    "lo": 757688
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 894084
+                    "lo": 864707
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 894084
+                        "lo": 864707
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 894084
+                            "lo": 864707
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 894084
+                                  "lo": 864707
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 894084
+                                  "lo": 864707
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 894084
+                            "lo": 864707
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 894084
+                            "lo": 864707
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 864707
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 894084
+                          "lo": 864707
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 342061
+                          "lo": 757688
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.146.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.146.json
index 793f9776..ddbd26f8 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.146.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.146.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 504769
+                    "lo": 767675
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 918384
+                    "lo": 395546
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 504769
+                    "lo": 767675
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 504769
+                        "lo": 767675
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 504769
+                            "lo": 767675
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 504769
+                                  "lo": 767675
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 504769
+                                  "lo": 767675
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 504769
+                            "lo": 767675
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 504769
+                            "lo": 767675
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 767675
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 504769
+                          "lo": 767675
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 918384
+                          "lo": 395546
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.147.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.147.json
index ddf577b2..39a8b3aa 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.147.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.147.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 475387
+                    "lo": 165106
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 569398
+                    "lo": 999500
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 475387
+                    "lo": 165106
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 475387
+                        "lo": 165106
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 475387
+                            "lo": 165106
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 475387
+                                  "lo": 165106
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 475387
+                                  "lo": 165106
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 475387
+                            "lo": 165106
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 475387
+                            "lo": 165106
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 165106
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 475387
+                          "lo": 165106
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 569398
+                          "lo": 999500
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.148.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.148.json
index b5b66ba0..cc3ed571 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.148.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.148.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 902037
+                    "lo": 518109
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 1501
+                    "lo": 4752
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 902037
+                    "lo": 518109
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 902037
+                        "lo": 518109
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 902037
+                            "lo": 518109
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 902037
+                                  "lo": 518109
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 902037
+                                  "lo": 518109
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 902037
+                            "lo": 518109
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 902037
+                            "lo": 518109
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 518109
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 902037
+                          "lo": 518109
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 1501
+                          "lo": 4752
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.149.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.149.json
index 0d8052e8..032ceed0 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.149.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.149.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 209478
+                    "lo": 911829
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 45095
+                    "lo": 183265
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 209478
+                    "lo": 911829
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 209478
+                        "lo": 911829
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 209478
+                            "lo": 911829
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 209478
+                                  "lo": 911829
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 209478
+                                  "lo": 911829
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 209478
+                            "lo": 911829
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 209478
+                            "lo": 911829
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 911829
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 209478
+                          "lo": 911829
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 45095
+                          "lo": 183265
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.15.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.15.json
index 9408ddd6..a92b6e06 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.15.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.15.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 191909
+                    "lo": 61678
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 271601
+                    "lo": 801070
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 191909
+                    "lo": 61678
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 191909
+                        "lo": 61678
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 191909
+                            "lo": 61678
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 191909
+                                  "lo": 61678
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 191909
+                                  "lo": 61678
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 191909
+                            "lo": 61678
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 191909
+                            "lo": 61678
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 61678
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 191909
+                          "lo": 61678
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 271601
+                          "lo": 801070
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.150.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.150.json
index 42ca9e46..38015b4a 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.150.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.150.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 511931
+                    "lo": 744001
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 835421
+                    "lo": 456596
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 511931
+                    "lo": 744001
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 511931
+                        "lo": 744001
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 511931
+                            "lo": 744001
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 511931
+                                  "lo": 744001
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 511931
+                                  "lo": 744001
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 511931
+                            "lo": 744001
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 511931
+                            "lo": 744001
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 744001
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 511931
+                          "lo": 744001
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 835421
+                          "lo": 456596
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.151.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.151.json
index f42f4e1d..3ac02c51 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.151.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.151.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 892242
+                    "lo": 853343
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 215792
+                    "lo": 75916
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 892242
+                    "lo": 853343
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 892242
+                        "lo": 853343
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 892242
+                            "lo": 853343
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 892242
+                                  "lo": 853343
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 892242
+                                  "lo": 853343
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 892242
+                            "lo": 853343
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 892242
+                            "lo": 853343
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 853343
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 892242
+                          "lo": 853343
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 215792
+                          "lo": 75916
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.152.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.152.json
index 39499163..e52d62df 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.152.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.152.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 919393
+                    "lo": 711579
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 724089
+                    "lo": 433478
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 919393
+                    "lo": 711579
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 919393
+                        "lo": 711579
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 919393
+                            "lo": 711579
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 919393
+                                  "lo": 711579
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 919393
+                                  "lo": 711579
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 919393
+                            "lo": 711579
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 919393
+                            "lo": 711579
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 711579
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 919393
+                          "lo": 711579
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 724089
+                          "lo": 433478
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.153.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.153.json
index b7b429a9..75fd9bad 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.153.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.153.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 487416
+                    "lo": 634121
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 623506
+                    "lo": 912542
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 487416
+                    "lo": 634121
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 487416
+                        "lo": 634121
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 487416
+                            "lo": 634121
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 487416
+                                  "lo": 634121
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 487416
+                                  "lo": 634121
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 487416
+                            "lo": 634121
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 487416
+                            "lo": 634121
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 634121
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 487416
+                          "lo": 634121
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 623506
+                          "lo": 912542
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.154.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.154.json
index 242da122..85f303f7 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.154.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.154.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 119026
+                    "lo": 66601
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 212535
+                    "lo": 78890
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 119026
+                    "lo": 66601
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 119026
+                        "lo": 66601
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 119026
+                            "lo": 66601
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 119026
+                                  "lo": 66601
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 119026
+                                  "lo": 66601
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 119026
+                            "lo": 66601
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 119026
+                            "lo": 66601
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 66601
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 119026
+                          "lo": 66601
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 212535
+                          "lo": 78890
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.155.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.155.json
index b557ccdf..2fe4bbc9 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.155.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.155.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 851153
+                    "lo": 177918
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 523103
+                    "lo": 383093
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 851153
+                    "lo": 177918
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 851153
+                        "lo": 177918
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 851153
+                            "lo": 177918
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 851153
+                                  "lo": 177918
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 851153
+                                  "lo": 177918
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 851153
+                            "lo": 177918
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 851153
+                            "lo": 177918
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 177918
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 851153
+                          "lo": 177918
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 523103
+                          "lo": 383093
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.156.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.156.json
index 91766775..3431a3b3 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.156.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.156.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 576220
+                    "lo": 401901
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 590637
+                    "lo": 973097
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 576220
+                    "lo": 401901
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 576220
+                        "lo": 401901
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 576220
+                            "lo": 401901
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 576220
+                                  "lo": 401901
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 576220
+                                  "lo": 401901
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 576220
+                            "lo": 401901
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 576220
+                            "lo": 401901
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 401901
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 576220
+                          "lo": 401901
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 590637
+                          "lo": 973097
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.157.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.157.json
index 2c73bbe1..ed18c2ad 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.157.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.157.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 244917
+                    "lo": 120223
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 928025
+                    "lo": 325581
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 244917
+                    "lo": 120223
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 244917
+                        "lo": 120223
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 244917
+                            "lo": 120223
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 244917
+                                  "lo": 120223
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 244917
+                                  "lo": 120223
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 244917
+                            "lo": 120223
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 244917
+                            "lo": 120223
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 120223
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 244917
+                          "lo": 120223
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 928025
+                          "lo": 325581
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.158.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.158.json
index d10b66d6..4ecb709c 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.158.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.158.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 487162
+                    "lo": 764898
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 91609
+                    "lo": 629869
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 487162
+                    "lo": 764898
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 487162
+                        "lo": 764898
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 487162
+                            "lo": 764898
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 487162
+                                  "lo": 764898
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 487162
+                                  "lo": 764898
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 487162
+                            "lo": 764898
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 487162
+                            "lo": 764898
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 764898
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 487162
+                          "lo": 764898
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 91609
+                          "lo": 629869
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.159.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.159.json
index 3f6b315d..e4c22c3e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.159.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.159.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 911178
+                    "lo": 912332
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 643927
+                    "lo": 499506
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 911178
+                    "lo": 912332
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 911178
+                        "lo": 912332
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 911178
+                            "lo": 912332
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 911178
+                                  "lo": 912332
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 911178
+                                  "lo": 912332
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 911178
+                            "lo": 912332
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 911178
+                            "lo": 912332
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 912332
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 911178
+                          "lo": 912332
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 643927
+                          "lo": 499506
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.16.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.16.json
index b05dbd2e..dfc020b8 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.16.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.16.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 738309
+                    "lo": 633767
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 707160
+                    "lo": 959516
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 738309
+                    "lo": 633767
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 738309
+                        "lo": 633767
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 738309
+                            "lo": 633767
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 738309
+                                  "lo": 633767
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 738309
+                                  "lo": 633767
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 738309
+                            "lo": 633767
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 738309
+                            "lo": 633767
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 633767
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 738309
+                          "lo": 633767
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 707160
+                          "lo": 959516
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.160.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.160.json
index c41a9a7b..872f2907 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.160.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.160.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 345699
+                    "lo": 443796
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 225873
+                    "lo": 437398
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 345699
+                    "lo": 443796
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 345699
+                        "lo": 443796
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 345699
+                            "lo": 443796
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 345699
+                                  "lo": 443796
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 345699
+                                  "lo": 443796
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 345699
+                            "lo": 443796
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 345699
+                            "lo": 443796
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 443796
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 345699
+                          "lo": 443796
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 225873
+                          "lo": 437398
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.161.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.161.json
index e5125c63..776aac25 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.161.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.161.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 863695
+                    "lo": 596825
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 544320
+                    "lo": 977895
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 863695
+                    "lo": 596825
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 863695
+                        "lo": 596825
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 863695
+                            "lo": 596825
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 863695
+                                  "lo": 596825
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 863695
+                                  "lo": 596825
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 863695
+                            "lo": 596825
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 863695
+                            "lo": 596825
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 596825
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 863695
+                          "lo": 596825
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 544320
+                          "lo": 977895
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.162.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.162.json
index 22f05a3c..eb823564 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.162.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.162.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 655515
+                    "lo": 365203
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 590760
+                    "lo": 878197
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 655515
+                    "lo": 365203
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 655515
+                        "lo": 365203
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 655515
+                            "lo": 365203
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 655515
+                                  "lo": 365203
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 655515
+                                  "lo": 365203
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 655515
+                            "lo": 365203
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 655515
+                            "lo": 365203
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 365203
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 655515
+                          "lo": 365203
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 590760
+                          "lo": 878197
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.163.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.163.json
index d2ff45c1..be954005 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.163.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.163.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 694583
+                    "lo": 469769
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 448059
+                    "lo": 50404
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 694583
+                    "lo": 469769
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 694583
+                        "lo": 469769
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 694583
+                            "lo": 469769
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 694583
+                                  "lo": 469769
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 694583
+                                  "lo": 469769
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 694583
+                            "lo": 469769
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 694583
+                            "lo": 469769
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 469769
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 694583
+                          "lo": 469769
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 448059
+                          "lo": 50404
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.164.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.164.json
index f32bf498..f0eb0242 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.164.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.164.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 226450
+                    "lo": 234181
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 733565
+                    "lo": 305724
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 226450
+                    "lo": 234181
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 226450
+                        "lo": 234181
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 226450
+                            "lo": 234181
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 226450
+                                  "lo": 234181
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 226450
+                                  "lo": 234181
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 226450
+                            "lo": 234181
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 226450
+                            "lo": 234181
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 234181
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 226450
+                          "lo": 234181
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 733565
+                          "lo": 305724
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.165.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.165.json
index ff7e2af4..b3deb72c 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.165.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.165.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 929998
+                    "lo": 852954
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 459241
+                    "lo": 833233
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 929998
+                    "lo": 852954
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 929998
+                        "lo": 852954
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 929998
+                            "lo": 852954
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 929998
+                                  "lo": 852954
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 929998
+                                  "lo": 852954
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 929998
+                            "lo": 852954
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 929998
+                            "lo": 852954
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 852954
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 929998
+                          "lo": 852954
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 459241
+                          "lo": 833233
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.166.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.166.json
index a7c5b06a..ef641606 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.166.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.166.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 957035
+                    "lo": 926734
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 149089
+                    "lo": 26507
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 957035
+                    "lo": 926734
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 957035
+                        "lo": 926734
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 957035
+                            "lo": 926734
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 957035
+                                  "lo": 926734
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 957035
+                                  "lo": 926734
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 957035
+                            "lo": 926734
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 957035
+                            "lo": 926734
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 926734
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 957035
+                          "lo": 926734
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 149089
+                          "lo": 26507
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.167.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.167.json
index 2bcd74ff..e2909087 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.167.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.167.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 346126
+                    "lo": 828787
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 726332
+                    "lo": 212928
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 346126
+                    "lo": 828787
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 346126
+                        "lo": 828787
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 346126
+                            "lo": 828787
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 346126
+                                  "lo": 828787
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 346126
+                                  "lo": 828787
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 346126
+                            "lo": 828787
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 346126
+                            "lo": 828787
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 828787
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 346126
+                          "lo": 828787
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 726332
+                          "lo": 212928
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.168.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.168.json
index ef41e63f..3fe9c1c3 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.168.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.168.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 975653
+                    "lo": 351520
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 407978
+                    "lo": 733617
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 975653
+                    "lo": 351520
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 975653
+                        "lo": 351520
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 975653
+                            "lo": 351520
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 975653
+                                  "lo": 351520
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 975653
+                                  "lo": 351520
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 975653
+                            "lo": 351520
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 975653
+                            "lo": 351520
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 351520
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 975653
+                          "lo": 351520
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 407978
+                          "lo": 733617
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.169.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.169.json
index 9c39e139..d3d1850e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.169.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.169.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 42001
+                    "lo": 535244
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 480064
+                    "lo": 798517
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 42001
+                    "lo": 535244
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 42001
+                        "lo": 535244
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 42001
+                            "lo": 535244
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 42001
+                                  "lo": 535244
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 42001
+                                  "lo": 535244
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 42001
+                            "lo": 535244
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 42001
+                            "lo": 535244
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 535244
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 42001
+                          "lo": 535244
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 480064
+                          "lo": 798517
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.17.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.17.json
index 3ba4e8fb..7031009b 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.17.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.17.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 976177
+                    "lo": 319062
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 572673
+                    "lo": 547861
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 976177
+                    "lo": 319062
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 976177
+                        "lo": 319062
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 976177
+                            "lo": 319062
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 976177
+                                  "lo": 319062
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 976177
+                                  "lo": 319062
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 976177
+                            "lo": 319062
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 976177
+                            "lo": 319062
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 319062
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 976177
+                          "lo": 319062
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 572673
+                          "lo": 547861
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.170.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.170.json
index 9fc2600f..673c455e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.170.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.170.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 128411
+                    "lo": 735127
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 472866
+                    "lo": 153808
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 128411
+                    "lo": 735127
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 128411
+                        "lo": 735127
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 128411
+                            "lo": 735127
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 128411
+                                  "lo": 735127
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 128411
+                                  "lo": 735127
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 128411
+                            "lo": 735127
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 128411
+                            "lo": 735127
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 735127
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 128411
+                          "lo": 735127
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 472866
+                          "lo": 153808
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.171.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.171.json
index 2956251b..38558f7d 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.171.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.171.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 25351
+                    "lo": 91389
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 809213
+                    "lo": 391247
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 25351
+                    "lo": 91389
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 25351
+                        "lo": 91389
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 25351
+                            "lo": 91389
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 25351
+                                  "lo": 91389
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 25351
+                                  "lo": 91389
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 25351
+                            "lo": 91389
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 25351
+                            "lo": 91389
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 91389
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 25351
+                          "lo": 91389
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 809213
+                          "lo": 391247
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.172.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.172.json
index a985cb18..fb7aa746 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.172.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.172.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 9615
+                    "lo": 343504
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 971917
+                    "lo": 246994
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 9615
+                    "lo": 343504
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 9615
+                        "lo": 343504
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 9615
+                            "lo": 343504
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 9615
+                                  "lo": 343504
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 9615
+                                  "lo": 343504
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 9615
+                            "lo": 343504
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 9615
+                            "lo": 343504
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 343504
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 9615
+                          "lo": 343504
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 971917
+                          "lo": 246994
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.173.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.173.json
index f989e9eb..4d1e590d 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.173.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.173.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 472240
+                    "lo": 849211
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 973140
+                    "lo": 893848
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 472240
+                    "lo": 849211
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 472240
+                        "lo": 849211
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 472240
+                            "lo": 849211
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 472240
+                                  "lo": 849211
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 472240
+                                  "lo": 849211
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 472240
+                            "lo": 849211
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 472240
+                            "lo": 849211
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 849211
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 472240
+                          "lo": 849211
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 973140
+                          "lo": 893848
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.174.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.174.json
index 8d1df390..b0145acd 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.174.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.174.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 813357
+                    "lo": 478979
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 252021
+                    "lo": 110689
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 813357
+                    "lo": 478979
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 813357
+                        "lo": 478979
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 813357
+                            "lo": 478979
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 813357
+                                  "lo": 478979
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 813357
+                                  "lo": 478979
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 813357
+                            "lo": 478979
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 813357
+                            "lo": 478979
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 478979
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 813357
+                          "lo": 478979
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 252021
+                          "lo": 110689
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.175.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.175.json
index a280b65e..2e82e8cd 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.175.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.175.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 294752
+                    "lo": 337007
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 922024
+                    "lo": 756058
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 294752
+                    "lo": 337007
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 294752
+                        "lo": 337007
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 294752
+                            "lo": 337007
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 294752
+                                  "lo": 337007
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 294752
+                                  "lo": 337007
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 294752
+                            "lo": 337007
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 294752
+                            "lo": 337007
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 337007
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 294752
+                          "lo": 337007
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 922024
+                          "lo": 756058
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.176.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.176.json
index 25e8e7bd..1bf5b5cb 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.176.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.176.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 251772
+                    "lo": 383466
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 883217
+                    "lo": 839723
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 251772
+                    "lo": 383466
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 251772
+                        "lo": 383466
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 251772
+                            "lo": 383466
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 251772
+                                  "lo": 383466
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 251772
+                                  "lo": 383466
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 251772
+                            "lo": 383466
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 251772
+                            "lo": 383466
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 383466
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 251772
+                          "lo": 383466
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 883217
+                          "lo": 839723
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.177.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.177.json
index 303e7fad..2d49ecc5 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.177.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.177.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 784311
+                    "lo": 777365
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 380203
+                    "lo": 590924
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 784311
+                    "lo": 777365
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 784311
+                        "lo": 777365
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 784311
+                            "lo": 777365
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 784311
+                                  "lo": 777365
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 784311
+                                  "lo": 777365
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 784311
+                            "lo": 777365
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 784311
+                            "lo": 777365
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 777365
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 784311
+                          "lo": 777365
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 380203
+                          "lo": 590924
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.178.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.178.json
index 21c2f771..5a7a14c9 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.178.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.178.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 587394
+                    "lo": 186237
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 265290
+                    "lo": 291984
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 587394
+                    "lo": 186237
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 587394
+                        "lo": 186237
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 587394
+                            "lo": 186237
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 587394
+                                  "lo": 186237
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 587394
+                                  "lo": 186237
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 587394
+                            "lo": 186237
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 587394
+                            "lo": 186237
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 186237
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 587394
+                          "lo": 186237
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 265290
+                          "lo": 291984
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.179.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.179.json
index 87a06da2..2d3c55e6 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.179.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.179.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 55020
+                    "lo": 344179
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 671961
+                    "lo": 567768
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 55020
+                    "lo": 344179
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 55020
+                        "lo": 344179
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 55020
+                            "lo": 344179
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 55020
+                                  "lo": 344179
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 55020
+                                  "lo": 344179
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 55020
+                            "lo": 344179
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 55020
+                            "lo": 344179
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 344179
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 55020
+                          "lo": 344179
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 671961
+                          "lo": 567768
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.18.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.18.json
index bebfcf45..b3fc32ba 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.18.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.18.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 774578
+                    "lo": 806080
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 219915
+                    "lo": 805130
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 774578
+                    "lo": 806080
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 774578
+                        "lo": 806080
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 774578
+                            "lo": 806080
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 774578
+                                  "lo": 806080
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 774578
+                                  "lo": 806080
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 774578
+                            "lo": 806080
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 774578
+                            "lo": 806080
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 806080
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 774578
+                          "lo": 806080
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 219915
+                          "lo": 805130
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.180.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.180.json
index cf3a8dce..0a14e932 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.180.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.180.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 754318
+                    "lo": 790166
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 752007
+                    "lo": 124265
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 754318
+                    "lo": 790166
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 754318
+                        "lo": 790166
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 754318
+                            "lo": 790166
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 754318
+                                  "lo": 790166
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 754318
+                                  "lo": 790166
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 754318
+                            "lo": 790166
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 754318
+                            "lo": 790166
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 790166
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 754318
+                          "lo": 790166
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 752007
+                          "lo": 124265
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.181.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.181.json
index 4138d6b5..73927c68 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.181.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.181.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 22835
+                    "lo": 320815
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 897150
+                    "lo": 547826
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 22835
+                    "lo": 320815
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 22835
+                        "lo": 320815
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 22835
+                            "lo": 320815
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 22835
+                                  "lo": 320815
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 22835
+                                  "lo": 320815
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 22835
+                            "lo": 320815
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 22835
+                            "lo": 320815
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 320815
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 22835
+                          "lo": 320815
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 897150
+                          "lo": 547826
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.182.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.182.json
index 904bc084..56471de9 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.182.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.182.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 897472
+                    "lo": 430765
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 736012
+                    "lo": 440509
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 897472
+                    "lo": 430765
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 897472
+                        "lo": 430765
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 897472
+                            "lo": 430765
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 897472
+                                  "lo": 430765
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 897472
+                                  "lo": 430765
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 897472
+                            "lo": 430765
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 897472
+                            "lo": 430765
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 430765
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 897472
+                          "lo": 430765
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 736012
+                          "lo": 440509
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.183.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.183.json
index c6f6594c..cfa5ca3e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.183.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.183.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 225382
+                    "lo": 454169
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 513164
+                    "lo": 769530
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 225382
+                    "lo": 454169
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 225382
+                        "lo": 454169
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 225382
+                            "lo": 454169
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 225382
+                                  "lo": 454169
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 225382
+                                  "lo": 454169
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 225382
+                            "lo": 454169
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 225382
+                            "lo": 454169
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 454169
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 225382
+                          "lo": 454169
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 513164
+                          "lo": 769530
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.184.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.184.json
index 171797d8..aecfe354 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.184.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.184.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 175147
+                    "lo": 174404
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 739828
+                    "lo": 155279
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 175147
+                    "lo": 174404
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 175147
+                        "lo": 174404
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 175147
+                            "lo": 174404
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 175147
+                                  "lo": 174404
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 175147
+                                  "lo": 174404
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 175147
+                            "lo": 174404
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 175147
+                            "lo": 174404
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 174404
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 175147
+                          "lo": 174404
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 739828
+                          "lo": 155279
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.185.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.185.json
index 5609199e..0e622023 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.185.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.185.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 772572
+                    "lo": 339780
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 520000
+                    "lo": 164617
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 772572
+                    "lo": 339780
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 772572
+                        "lo": 339780
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 772572
+                            "lo": 339780
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 772572
+                                  "lo": 339780
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 772572
+                                  "lo": 339780
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 772572
+                            "lo": 339780
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 772572
+                            "lo": 339780
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 339780
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 772572
+                          "lo": 339780
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 520000
+                          "lo": 164617
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.186.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.186.json
index 6ab8faf9..d6f9f5fa 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.186.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.186.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 412957
+                    "lo": 943882
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 861840
+                    "lo": 745746
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 412957
+                    "lo": 943882
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 412957
+                        "lo": 943882
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 412957
+                            "lo": 943882
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 412957
+                                  "lo": 943882
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 412957
+                                  "lo": 943882
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 412957
+                            "lo": 943882
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 412957
+                            "lo": 943882
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 943882
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 412957
+                          "lo": 943882
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 861840
+                          "lo": 745746
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.187.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.187.json
index 60100f5e..f96c06c2 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.187.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.187.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 2753
+                    "lo": 910648
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 5278
+                    "lo": 219219
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 2753
+                    "lo": 910648
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 2753
+                        "lo": 910648
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 2753
+                            "lo": 910648
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 2753
+                                  "lo": 910648
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 2753
+                                  "lo": 910648
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 2753
+                            "lo": 910648
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 2753
+                            "lo": 910648
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 910648
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 2753
+                          "lo": 910648
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 5278
+                          "lo": 219219
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.188.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.188.json
index 08471fe5..4ad9ed84 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.188.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.188.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 818891
+                    "lo": 228336
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 408184
+                    "lo": 331758
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 818891
+                    "lo": 228336
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 818891
+                        "lo": 228336
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 818891
+                            "lo": 228336
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 818891
+                                  "lo": 228336
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 818891
+                                  "lo": 228336
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 818891
+                            "lo": 228336
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 818891
+                            "lo": 228336
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 228336
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 818891
+                          "lo": 228336
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 408184
+                          "lo": 331758
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.189.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.189.json
index 6bb071cc..49c4a85d 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.189.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.189.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 708013
+                    "lo": 644322
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 251372
+                    "lo": 935393
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 708013
+                    "lo": 644322
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 708013
+                        "lo": 644322
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 708013
+                            "lo": 644322
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 708013
+                                  "lo": 644322
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 708013
+                                  "lo": 644322
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 708013
+                            "lo": 644322
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 708013
+                            "lo": 644322
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 644322
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 708013
+                          "lo": 644322
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 251372
+                          "lo": 935393
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.19.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.19.json
index 315fe6b4..a77da357 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.19.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.19.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 600478
+                    "lo": 210297
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 196058
+                    "lo": 306422
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 600478
+                    "lo": 210297
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 600478
+                        "lo": 210297
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 600478
+                            "lo": 210297
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 600478
+                                  "lo": 210297
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 600478
+                                  "lo": 210297
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 600478
+                            "lo": 210297
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 600478
+                            "lo": 210297
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 210297
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 600478
+                          "lo": 210297
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 196058
+                          "lo": 306422
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.190.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.190.json
index 00a6ca81..90963fc7 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.190.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.190.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 757938
+                    "lo": 797273
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 469923
+                    "lo": 110775
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 757938
+                    "lo": 797273
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 757938
+                        "lo": 797273
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 757938
+                            "lo": 797273
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 757938
+                                  "lo": 797273
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 757938
+                                  "lo": 797273
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 757938
+                            "lo": 797273
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 757938
+                            "lo": 797273
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 797273
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 757938
+                          "lo": 797273
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 469923
+                          "lo": 110775
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.191.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.191.json
index b06aba25..765e31b7 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.191.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.191.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 500106
+                    "lo": 893424
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 346228
+                    "lo": 358875
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 500106
+                    "lo": 893424
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 500106
+                        "lo": 893424
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 500106
+                            "lo": 893424
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 500106
+                                  "lo": 893424
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 500106
+                                  "lo": 893424
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 500106
+                            "lo": 893424
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 500106
+                            "lo": 893424
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 893424
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 500106
+                          "lo": 893424
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 346228
+                          "lo": 358875
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.192.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.192.json
index 3c0a854a..98723f14 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.192.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.192.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 716769
+                    "lo": 443357
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 416377
+                    "lo": 470209
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 716769
+                    "lo": 443357
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 716769
+                        "lo": 443357
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 716769
+                            "lo": 443357
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 716769
+                                  "lo": 443357
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 716769
+                                  "lo": 443357
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 716769
+                            "lo": 443357
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 716769
+                            "lo": 443357
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 443357
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 716769
+                          "lo": 443357
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 416377
+                          "lo": 470209
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.193.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.193.json
index 687a7c7c..86a2cbee 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.193.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.193.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 109469
+                    "lo": 617757
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 97309
+                    "lo": 634654
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 109469
+                    "lo": 617757
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 109469
+                        "lo": 617757
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 109469
+                            "lo": 617757
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 109469
+                                  "lo": 617757
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 109469
+                                  "lo": 617757
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 109469
+                            "lo": 617757
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 109469
+                            "lo": 617757
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 617757
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 109469
+                          "lo": 617757
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 97309
+                          "lo": 634654
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.194.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.194.json
index f2e3f07c..4210db4c 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.194.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.194.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 786125
+                    "lo": 373204
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 560343
+                    "lo": 269958
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 786125
+                    "lo": 373204
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 786125
+                        "lo": 373204
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 786125
+                            "lo": 373204
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 786125
+                                  "lo": 373204
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 786125
+                                  "lo": 373204
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 786125
+                            "lo": 373204
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 786125
+                            "lo": 373204
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 373204
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 786125
+                          "lo": 373204
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 560343
+                          "lo": 269958
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.195.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.195.json
index 63588958..2c7524fd 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.195.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.195.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 573824
+                    "lo": 825442
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 310320
+                    "lo": 614251
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 573824
+                    "lo": 825442
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 573824
+                        "lo": 825442
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 573824
+                            "lo": 825442
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 573824
+                                  "lo": 825442
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 573824
+                                  "lo": 825442
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 573824
+                            "lo": 825442
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 573824
+                            "lo": 825442
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 825442
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 573824
+                          "lo": 825442
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 310320
+                          "lo": 614251
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.196.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.196.json
index 4715107f..d245e157 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.196.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.196.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 149545
+                    "lo": 505451
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 680436
+                    "lo": 708634
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 149545
+                    "lo": 505451
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 149545
+                        "lo": 505451
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 149545
+                            "lo": 505451
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 149545
+                                  "lo": 505451
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 149545
+                                  "lo": 505451
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 149545
+                            "lo": 505451
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 149545
+                            "lo": 505451
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 505451
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 149545
+                          "lo": 505451
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 680436
+                          "lo": 708634
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.197.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.197.json
index 79979674..a6363eef 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.197.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.197.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 640519
+                    "lo": 694232
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 412754
+                    "lo": 703090
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 640519
+                    "lo": 694232
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 640519
+                        "lo": 694232
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 640519
+                            "lo": 694232
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 640519
+                                  "lo": 694232
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 640519
+                                  "lo": 694232
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 640519
+                            "lo": 694232
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 640519
+                            "lo": 694232
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 694232
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 640519
+                          "lo": 694232
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 412754
+                          "lo": 703090
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.198.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.198.json
index ac7f4b0b..e79cf38f 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.198.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.198.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 430434
+                    "lo": 734224
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 312472
+                    "lo": 282406
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 430434
+                    "lo": 734224
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 430434
+                        "lo": 734224
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 430434
+                            "lo": 734224
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 430434
+                                  "lo": 734224
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 430434
+                                  "lo": 734224
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 430434
+                            "lo": 734224
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 430434
+                            "lo": 734224
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 734224
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 430434
+                          "lo": 734224
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 312472
+                          "lo": 282406
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.199.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.199.json
index 9d8705a4..db420951 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.199.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.199.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 683263
+                    "lo": 417530
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 352607
+                    "lo": 340357
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 683263
+                    "lo": 417530
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 683263
+                        "lo": 417530
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 683263
+                            "lo": 417530
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 683263
+                                  "lo": 417530
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 683263
+                                  "lo": 417530
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 683263
+                            "lo": 417530
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 683263
+                            "lo": 417530
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 417530
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 683263
+                          "lo": 417530
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 352607
+                          "lo": 340357
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.2.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.2.json
index 8c735f64..21286acd 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.2.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.2.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 694517
+                    "lo": 176263
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 37904
+                    "lo": 441304
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 694517
+                    "lo": 176263
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 694517
+                        "lo": 176263
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 694517
+                            "lo": 176263
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 694517
+                                  "lo": 176263
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 694517
+                                  "lo": 176263
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 694517
+                            "lo": 176263
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 694517
+                            "lo": 176263
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 176263
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 694517
+                          "lo": 176263
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 37904
+                          "lo": 441304
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.20.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.20.json
index 8c09786d..2ecbe283 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.20.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.20.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 222926
+                    "lo": 267410
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 114446
+                    "lo": 476456
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 222926
+                    "lo": 267410
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 222926
+                        "lo": 267410
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 222926
+                            "lo": 267410
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 222926
+                                  "lo": 267410
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 222926
+                                  "lo": 267410
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 222926
+                            "lo": 267410
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 222926
+                            "lo": 267410
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 267410
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 222926
+                          "lo": 267410
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 114446
+                          "lo": 476456
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.200.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.200.json
index b200ad27..dc9afc42 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.200.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.200.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 406429
+                    "lo": 895822
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 649460
+                    "lo": 620845
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 406429
+                    "lo": 895822
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 406429
+                        "lo": 895822
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 406429
+                            "lo": 895822
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 406429
+                                  "lo": 895822
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 406429
+                                  "lo": 895822
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 406429
+                            "lo": 895822
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 406429
+                            "lo": 895822
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 895822
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 406429
+                          "lo": 895822
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 649460
+                          "lo": 620845
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.201.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.201.json
index 80a218b7..42f7add4 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.201.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.201.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 521883
+                    "lo": 765309
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 200632
+                    "lo": 881142
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 521883
+                    "lo": 765309
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 521883
+                        "lo": 765309
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 521883
+                            "lo": 765309
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 521883
+                                  "lo": 765309
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 521883
+                                  "lo": 765309
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 521883
+                            "lo": 765309
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 521883
+                            "lo": 765309
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 765309
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 521883
+                          "lo": 765309
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 200632
+                          "lo": 881142
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.202.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.202.json
index 8fe3b055..0ecdf2b0 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.202.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.202.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 55161
+                    "lo": 73374
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 688554
+                    "lo": 413280
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 55161
+                    "lo": 73374
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 55161
+                        "lo": 73374
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 55161
+                            "lo": 73374
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 55161
+                                  "lo": 73374
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 55161
+                                  "lo": 73374
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 55161
+                            "lo": 73374
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 55161
+                            "lo": 73374
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 73374
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 55161
+                          "lo": 73374
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 688554
+                          "lo": 413280
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.203.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.203.json
index ccd11fa5..6621d721 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.203.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.203.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 713500
+                    "lo": 328937
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 569257
+                    "lo": 231522
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 713500
+                    "lo": 328937
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 713500
+                        "lo": 328937
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 713500
+                            "lo": 328937
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 713500
+                                  "lo": 328937
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 713500
+                                  "lo": 328937
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 713500
+                            "lo": 328937
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 713500
+                            "lo": 328937
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 328937
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 713500
+                          "lo": 328937
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 569257
+                          "lo": 231522
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.204.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.204.json
index dfd5a406..880586ae 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.204.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.204.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 672353
+                    "lo": 802507
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 308021
+                    "lo": 808217
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 672353
+                    "lo": 802507
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 672353
+                        "lo": 802507
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 672353
+                            "lo": 802507
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 672353
+                                  "lo": 802507
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 672353
+                                  "lo": 802507
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 672353
+                            "lo": 802507
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 672353
+                            "lo": 802507
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 802507
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 672353
+                          "lo": 802507
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 308021
+                          "lo": 808217
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.205.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.205.json
index c227e14d..2672db86 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.205.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.205.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 688923
+                    "lo": 953591
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 696757
+                    "lo": 147781
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 688923
+                    "lo": 953591
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 688923
+                        "lo": 953591
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 688923
+                            "lo": 953591
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 688923
+                                  "lo": 953591
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 688923
+                                  "lo": 953591
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 688923
+                            "lo": 953591
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 688923
+                            "lo": 953591
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 953591
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 688923
+                          "lo": 953591
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 696757
+                          "lo": 147781
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.206.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.206.json
index 1536d998..0012d6d7 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.206.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.206.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 17623
+                    "lo": 55629
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 826440
+                    "lo": 658244
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 17623
+                    "lo": 55629
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 17623
+                        "lo": 55629
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 17623
+                            "lo": 55629
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 17623
+                                  "lo": 55629
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 17623
+                                  "lo": 55629
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 17623
+                            "lo": 55629
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 17623
+                            "lo": 55629
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 55629
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 17623
+                          "lo": 55629
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 826440
+                          "lo": 658244
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.207.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.207.json
index 8794a0e6..25498f3d 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.207.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.207.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 754960
+                    "lo": 185175
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 816231
+                    "lo": 644104
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 754960
+                    "lo": 185175
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 754960
+                        "lo": 185175
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 754960
+                            "lo": 185175
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 754960
+                                  "lo": 185175
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 754960
+                                  "lo": 185175
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 754960
+                            "lo": 185175
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 754960
+                            "lo": 185175
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 185175
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 754960
+                          "lo": 185175
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 816231
+                          "lo": 644104
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.208.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.208.json
index df54fa84..e8ccc8c2 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.208.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.208.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 822312
+                    "lo": 446946
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 594447
+                    "lo": 104164
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 822312
+                    "lo": 446946
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 822312
+                        "lo": 446946
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 822312
+                            "lo": 446946
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 822312
+                                  "lo": 446946
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 822312
+                                  "lo": 446946
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 822312
+                            "lo": 446946
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 822312
+                            "lo": 446946
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 446946
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 822312
+                          "lo": 446946
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 594447
+                          "lo": 104164
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.209.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.209.json
index 0b79c8ee..09d98d2d 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.209.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.209.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 172505
+                    "lo": 402932
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 55474
+                    "lo": 421288
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 172505
+                    "lo": 402932
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 172505
+                        "lo": 402932
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 172505
+                            "lo": 402932
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 172505
+                                  "lo": 402932
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 172505
+                                  "lo": 402932
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 172505
+                            "lo": 402932
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 172505
+                            "lo": 402932
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 402932
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 172505
+                          "lo": 402932
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 55474
+                          "lo": 421288
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.21.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.21.json
index 9b67a755..7d06000b 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.21.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.21.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 381889
+                    "lo": 725820
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 532951
+                    "lo": 220418
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 381889
+                    "lo": 725820
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 381889
+                        "lo": 725820
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 381889
+                            "lo": 725820
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 381889
+                                  "lo": 725820
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 381889
+                                  "lo": 725820
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 381889
+                            "lo": 725820
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 381889
+                            "lo": 725820
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 725820
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 381889
+                          "lo": 725820
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 532951
+                          "lo": 220418
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.210.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.210.json
index bf961c94..85b6643e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.210.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.210.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 689159
+                    "lo": 381787
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 55901
+                    "lo": 889214
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 689159
+                    "lo": 381787
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 689159
+                        "lo": 381787
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 689159
+                            "lo": 381787
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 689159
+                                  "lo": 381787
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 689159
+                                  "lo": 381787
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 689159
+                            "lo": 381787
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 689159
+                            "lo": 381787
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 381787
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 689159
+                          "lo": 381787
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 55901
+                          "lo": 889214
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.211.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.211.json
index 17985af9..408934d9 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.211.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.211.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 297630
+                    "lo": 998747
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 226245
+                    "lo": 607539
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 297630
+                    "lo": 998747
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 297630
+                        "lo": 998747
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 297630
+                            "lo": 998747
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 297630
+                                  "lo": 998747
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 297630
+                                  "lo": 998747
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 297630
+                            "lo": 998747
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 297630
+                            "lo": 998747
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 998747
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 297630
+                          "lo": 998747
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 226245
+                          "lo": 607539
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.212.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.212.json
index 7d358bf8..0221be59 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.212.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.212.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 442157
+                    "lo": 808710
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 925990
+                    "lo": 614653
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 442157
+                    "lo": 808710
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 442157
+                        "lo": 808710
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 442157
+                            "lo": 808710
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 442157
+                                  "lo": 808710
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 442157
+                                  "lo": 808710
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 442157
+                            "lo": 808710
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 442157
+                            "lo": 808710
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 808710
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 442157
+                          "lo": 808710
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 925990
+                          "lo": 614653
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.213.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.213.json
index b4d0f679..2802abcb 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.213.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.213.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 592491
+                    "lo": 841225
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 615104
+                    "lo": 461350
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 592491
+                    "lo": 841225
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 592491
+                        "lo": 841225
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 592491
+                            "lo": 841225
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 592491
+                                  "lo": 841225
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 592491
+                                  "lo": 841225
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 592491
+                            "lo": 841225
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 592491
+                            "lo": 841225
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 841225
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 592491
+                          "lo": 841225
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 615104
+                          "lo": 461350
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.214.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.214.json
index 457f5a14..4f9a7332 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.214.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.214.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 222985
+                    "lo": 259157
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 133164
+                    "lo": 781538
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 222985
+                    "lo": 259157
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 222985
+                        "lo": 259157
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 222985
+                            "lo": 259157
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 222985
+                                  "lo": 259157
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 222985
+                                  "lo": 259157
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 222985
+                            "lo": 259157
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 222985
+                            "lo": 259157
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 259157
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 222985
+                          "lo": 259157
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 133164
+                          "lo": 781538
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.215.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.215.json
index 31c6e544..e638accc 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.215.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.215.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 389591
+                    "lo": 158646
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 452515
+                    "lo": 334400
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 389591
+                    "lo": 158646
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 389591
+                        "lo": 158646
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 389591
+                            "lo": 158646
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 389591
+                                  "lo": 158646
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 389591
+                                  "lo": 158646
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 389591
+                            "lo": 158646
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 389591
+                            "lo": 158646
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 158646
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 389591
+                          "lo": 158646
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 452515
+                          "lo": 334400
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.216.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.216.json
index 5f11ae76..4e98c82d 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.216.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.216.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 404324
+                    "lo": 672207
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 405267
+                    "lo": 402352
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 404324
+                    "lo": 672207
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 404324
+                        "lo": 672207
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 404324
+                            "lo": 672207
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 404324
+                                  "lo": 672207
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 404324
+                                  "lo": 672207
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 404324
+                            "lo": 672207
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 404324
+                            "lo": 672207
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 672207
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 404324
+                          "lo": 672207
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 405267
+                          "lo": 402352
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.217.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.217.json
index 4c599c29..fa305449 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.217.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.217.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 63754
+                    "lo": 862342
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 950512
+                    "lo": 256570
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 63754
+                    "lo": 862342
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 63754
+                        "lo": 862342
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 63754
+                            "lo": 862342
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 63754
+                                  "lo": 862342
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 63754
+                                  "lo": 862342
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 63754
+                            "lo": 862342
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 63754
+                            "lo": 862342
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 862342
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 63754
+                          "lo": 862342
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 950512
+                          "lo": 256570
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.218.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.218.json
index 721f234b..8c121a80 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.218.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.218.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 201384
+                    "lo": 971204
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 45963
+                    "lo": 105903
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 201384
+                    "lo": 971204
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 201384
+                        "lo": 971204
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 201384
+                            "lo": 971204
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 201384
+                                  "lo": 971204
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 201384
+                                  "lo": 971204
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 201384
+                            "lo": 971204
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 201384
+                            "lo": 971204
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 971204
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 201384
+                          "lo": 971204
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 45963
+                          "lo": 105903
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.219.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.219.json
index 0d1ccc45..014ad5b1 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.219.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.219.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 528219
+                    "lo": 32324
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 483456
+                    "lo": 460171
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 528219
+                    "lo": 32324
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 528219
+                        "lo": 32324
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 528219
+                            "lo": 32324
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 528219
+                                  "lo": 32324
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 528219
+                                  "lo": 32324
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 528219
+                            "lo": 32324
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 528219
+                            "lo": 32324
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 32324
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 528219
+                          "lo": 32324
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 483456
+                          "lo": 460171
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.22.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.22.json
index 80eddb0e..55972dd0 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.22.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.22.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 747521
+                    "lo": 669818
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 65736
+                    "lo": 340499
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 747521
+                    "lo": 669818
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 747521
+                        "lo": 669818
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 747521
+                            "lo": 669818
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 747521
+                                  "lo": 669818
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 747521
+                                  "lo": 669818
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 747521
+                            "lo": 669818
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 747521
+                            "lo": 669818
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 669818
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 747521
+                          "lo": 669818
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 65736
+                          "lo": 340499
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.220.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.220.json
index eba5ab13..63bd5df3 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.220.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.220.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 131443
+                    "lo": 300997
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 777296
+                    "lo": 730416
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 131443
+                    "lo": 300997
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 131443
+                        "lo": 300997
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 131443
+                            "lo": 300997
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 131443
+                                  "lo": 300997
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 131443
+                                  "lo": 300997
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 131443
+                            "lo": 300997
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 131443
+                            "lo": 300997
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 300997
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 131443
+                          "lo": 300997
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 777296
+                          "lo": 730416
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.221.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.221.json
index 4297de7b..f02c30c1 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.221.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.221.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 817970
+                    "lo": 69614
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 481016
+                    "lo": 741777
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 817970
+                    "lo": 69614
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 817970
+                        "lo": 69614
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 817970
+                            "lo": 69614
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 817970
+                                  "lo": 69614
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 817970
+                                  "lo": 69614
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 817970
+                            "lo": 69614
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 817970
+                            "lo": 69614
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 69614
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 817970
+                          "lo": 69614
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 481016
+                          "lo": 741777
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.222.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.222.json
index 7ab9355a..4b27ce0b 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.222.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.222.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 879434
+                    "lo": 206550
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 360954
+                    "lo": 358603
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 879434
+                    "lo": 206550
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 879434
+                        "lo": 206550
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 879434
+                            "lo": 206550
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 879434
+                                  "lo": 206550
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 879434
+                                  "lo": 206550
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 879434
+                            "lo": 206550
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 879434
+                            "lo": 206550
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 206550
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 879434
+                          "lo": 206550
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 360954
+                          "lo": 358603
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.223.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.223.json
index 1e7da7b7..3cb5caf5 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.223.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.223.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 921956
+                    "lo": 563934
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 789345
+                    "lo": 518304
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 921956
+                    "lo": 563934
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 921956
+                        "lo": 563934
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 921956
+                            "lo": 563934
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 921956
+                                  "lo": 563934
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 921956
+                                  "lo": 563934
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 921956
+                            "lo": 563934
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 921956
+                            "lo": 563934
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 563934
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 921956
+                          "lo": 563934
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 789345
+                          "lo": 518304
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.224.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.224.json
index 490b97e5..d85bd82a 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.224.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.224.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 854792
+                    "lo": 258566
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 756613
+                    "lo": 837573
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 854792
+                    "lo": 258566
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 854792
+                        "lo": 258566
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 854792
+                            "lo": 258566
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 854792
+                                  "lo": 258566
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 854792
+                                  "lo": 258566
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 854792
+                            "lo": 258566
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 854792
+                            "lo": 258566
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 258566
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 854792
+                          "lo": 258566
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 756613
+                          "lo": 837573
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.225.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.225.json
index 917bff6c..cdd4685b 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.225.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.225.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 838290
+                    "lo": 109646
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 281417
+                    "lo": 282293
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 838290
+                    "lo": 109646
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 838290
+                        "lo": 109646
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 838290
+                            "lo": 109646
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 838290
+                                  "lo": 109646
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 838290
+                                  "lo": 109646
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 838290
+                            "lo": 109646
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 838290
+                            "lo": 109646
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 109646
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 838290
+                          "lo": 109646
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 281417
+                          "lo": 282293
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.226.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.226.json
index 393de19d..ee6dcdde 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.226.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.226.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 171907
+                    "lo": 364207
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 836902
+                    "lo": 556993
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 171907
+                    "lo": 364207
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 171907
+                        "lo": 364207
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 171907
+                            "lo": 364207
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 171907
+                                  "lo": 364207
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 171907
+                                  "lo": 364207
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 171907
+                            "lo": 364207
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 171907
+                            "lo": 364207
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 364207
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 171907
+                          "lo": 364207
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 836902
+                          "lo": 556993
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.227.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.227.json
index c46484b9..ade20ae6 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.227.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.227.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 66131
+                    "lo": 922313
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 420979
+                    "lo": 831323
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 66131
+                    "lo": 922313
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 66131
+                        "lo": 922313
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 66131
+                            "lo": 922313
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 66131
+                                  "lo": 922313
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 66131
+                                  "lo": 922313
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 66131
+                            "lo": 922313
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 66131
+                            "lo": 922313
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 922313
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 66131
+                          "lo": 922313
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 420979
+                          "lo": 831323
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.228.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.228.json
index 4bd320c0..d8fda874 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.228.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.228.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 540911
+                    "lo": 699944
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 868932
+                    "lo": 414422
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 540911
+                    "lo": 699944
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 540911
+                        "lo": 699944
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 540911
+                            "lo": 699944
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 540911
+                                  "lo": 699944
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 540911
+                                  "lo": 699944
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 540911
+                            "lo": 699944
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 540911
+                            "lo": 699944
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 699944
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 540911
+                          "lo": 699944
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 868932
+                          "lo": 414422
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.229.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.229.json
index 4a68eaed..603fda92 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.229.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.229.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 399526
+                    "lo": 285458
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 589082
+                    "lo": 782081
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 399526
+                    "lo": 285458
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 399526
+                        "lo": 285458
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 399526
+                            "lo": 285458
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 399526
+                                  "lo": 285458
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 399526
+                                  "lo": 285458
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 399526
+                            "lo": 285458
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 399526
+                            "lo": 285458
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 285458
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 399526
+                          "lo": 285458
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 589082
+                          "lo": 782081
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.23.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.23.json
index 731c5999..9bc88595 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.23.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.23.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 848497
+                    "lo": 934599
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 364483
+                    "lo": 607225
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 848497
+                    "lo": 934599
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 848497
+                        "lo": 934599
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 848497
+                            "lo": 934599
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 848497
+                                  "lo": 934599
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 848497
+                                  "lo": 934599
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 848497
+                            "lo": 934599
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 848497
+                            "lo": 934599
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 934599
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 848497
+                          "lo": 934599
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 364483
+                          "lo": 607225
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.230.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.230.json
index 51904a3b..1813919f 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.230.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.230.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 87734
+                    "lo": 87600
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 539846
+                    "lo": 136225
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 87734
+                    "lo": 87600
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 87734
+                        "lo": 87600
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 87734
+                            "lo": 87600
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 87734
+                                  "lo": 87600
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 87734
+                                  "lo": 87600
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 87734
+                            "lo": 87600
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 87734
+                            "lo": 87600
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 87600
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 87734
+                          "lo": 87600
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 539846
+                          "lo": 136225
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.231.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.231.json
index 38f74ab6..90fa77ff 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.231.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.231.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 788310
+                    "lo": 848533
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 592789
+                    "lo": 667492
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 788310
+                    "lo": 848533
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 788310
+                        "lo": 848533
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 788310
+                            "lo": 848533
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 788310
+                                  "lo": 848533
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 788310
+                                  "lo": 848533
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 788310
+                            "lo": 848533
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 788310
+                            "lo": 848533
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 848533
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 788310
+                          "lo": 848533
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 592789
+                          "lo": 667492
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.232.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.232.json
index 4d2b2f2f..42b1905b 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.232.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.232.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 804861
+                    "lo": 405607
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 963602
+                    "lo": 108179
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 804861
+                    "lo": 405607
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 804861
+                        "lo": 405607
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 804861
+                            "lo": 405607
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 804861
+                                  "lo": 405607
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 804861
+                                  "lo": 405607
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 804861
+                            "lo": 405607
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 804861
+                            "lo": 405607
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 405607
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 804861
+                          "lo": 405607
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 963602
+                          "lo": 108179
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.233.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.233.json
index d8e90365..72454533 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.233.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.233.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 45675
+                    "lo": 328604
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 622078
+                    "lo": 319657
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 45675
+                    "lo": 328604
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 45675
+                        "lo": 328604
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 45675
+                            "lo": 328604
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 45675
+                                  "lo": 328604
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 45675
+                                  "lo": 328604
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 45675
+                            "lo": 328604
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 45675
+                            "lo": 328604
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 328604
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 45675
+                          "lo": 328604
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 622078
+                          "lo": 319657
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.234.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.234.json
index 5e926daa..9e55c643 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.234.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.234.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 689657
+                    "lo": 36921
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 181583
+                    "lo": 865321
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 689657
+                    "lo": 36921
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 689657
+                        "lo": 36921
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 689657
+                            "lo": 36921
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 689657
+                                  "lo": 36921
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 689657
+                                  "lo": 36921
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 689657
+                            "lo": 36921
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 689657
+                            "lo": 36921
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 36921
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 689657
+                          "lo": 36921
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 181583
+                          "lo": 865321
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.235.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.235.json
index bc49a0b5..8b7188e8 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.235.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.235.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 553213
+                    "lo": 677060
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 743417
+                    "lo": 995817
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 553213
+                    "lo": 677060
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 553213
+                        "lo": 677060
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 553213
+                            "lo": 677060
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 553213
+                                  "lo": 677060
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 553213
+                                  "lo": 677060
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 553213
+                            "lo": 677060
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 553213
+                            "lo": 677060
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 677060
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 553213
+                          "lo": 677060
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 743417
+                          "lo": 995817
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.236.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.236.json
index d582e8c7..ab606f9c 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.236.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.236.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 304694
+                    "lo": 662197
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 334725
+                    "lo": 341051
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 304694
+                    "lo": 662197
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 304694
+                        "lo": 662197
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 304694
+                            "lo": 662197
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 304694
+                                  "lo": 662197
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 304694
+                                  "lo": 662197
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 304694
+                            "lo": 662197
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 304694
+                            "lo": 662197
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 662197
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 304694
+                          "lo": 662197
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 334725
+                          "lo": 341051
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.237.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.237.json
index 1f6eb4bc..05a8aa8d 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.237.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.237.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 364483
+                    "lo": 108971
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 645253
+                    "lo": 855614
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 364483
+                    "lo": 108971
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 364483
+                        "lo": 108971
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 364483
+                            "lo": 108971
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 364483
+                                  "lo": 108971
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 364483
+                                  "lo": 108971
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 364483
+                            "lo": 108971
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 364483
+                            "lo": 108971
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 108971
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 364483
+                          "lo": 108971
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 645253
+                          "lo": 855614
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.238.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.238.json
index b8c7d6f9..92c813fb 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.238.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.238.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 713325
+                    "lo": 841282
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 865853
+                    "lo": 492498
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 713325
+                    "lo": 841282
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 713325
+                        "lo": 841282
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 713325
+                            "lo": 841282
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 713325
+                                  "lo": 841282
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 713325
+                                  "lo": 841282
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 713325
+                            "lo": 841282
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 713325
+                            "lo": 841282
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 841282
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 713325
+                          "lo": 841282
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 865853
+                          "lo": 492498
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.239.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.239.json
index b2dc47f2..0e3f5893 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.239.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.239.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 564255
+                    "lo": 112404
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 562357
+                    "lo": 68411
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 564255
+                    "lo": 112404
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 564255
+                        "lo": 112404
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 564255
+                            "lo": 112404
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 564255
+                                  "lo": 112404
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 564255
+                                  "lo": 112404
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 564255
+                            "lo": 112404
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 564255
+                            "lo": 112404
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 112404
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 564255
+                          "lo": 112404
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 562357
+                          "lo": 68411
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.24.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.24.json
index 8a326fcd..73cc57db 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.24.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.24.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 697422
+                    "lo": 591449
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 341172
+                    "lo": 783320
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 697422
+                    "lo": 591449
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 697422
+                        "lo": 591449
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 697422
+                            "lo": 591449
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 697422
+                                  "lo": 591449
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 697422
+                                  "lo": 591449
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 697422
+                            "lo": 591449
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 697422
+                            "lo": 591449
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 591449
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 697422
+                          "lo": 591449
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 341172
+                          "lo": 783320
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.240.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.240.json
index ec1cfc62..ee351c16 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.240.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.240.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 631337
+                    "lo": 203678
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 139672
+                    "lo": 259699
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 631337
+                    "lo": 203678
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 631337
+                        "lo": 203678
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 631337
+                            "lo": 203678
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 631337
+                                  "lo": 203678
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 631337
+                                  "lo": 203678
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 631337
+                            "lo": 203678
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 631337
+                            "lo": 203678
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 203678
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 631337
+                          "lo": 203678
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 139672
+                          "lo": 259699
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.241.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.241.json
index a201fdb5..e1d736f4 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.241.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.241.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 652529
+                    "lo": 519336
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 238033
+                    "lo": 689590
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 652529
+                    "lo": 519336
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 652529
+                        "lo": 519336
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 652529
+                            "lo": 519336
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 652529
+                                  "lo": 519336
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 652529
+                                  "lo": 519336
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 652529
+                            "lo": 519336
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 652529
+                            "lo": 519336
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 519336
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 652529
+                          "lo": 519336
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 238033
+                          "lo": 689590
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.242.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.242.json
index ace37d00..9f09e7d3 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.242.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.242.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 487822
+                    "lo": 587246
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 971948
+                    "lo": 853932
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 487822
+                    "lo": 587246
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 487822
+                        "lo": 587246
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 487822
+                            "lo": 587246
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 487822
+                                  "lo": 587246
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 487822
+                                  "lo": 587246
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 487822
+                            "lo": 587246
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 487822
+                            "lo": 587246
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 587246
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 487822
+                          "lo": 587246
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 971948
+                          "lo": 853932
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.243.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.243.json
index 8caa61eb..c6a57481 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.243.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.243.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 930828
+                    "lo": 713970
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 23227
+                    "lo": 93211
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 930828
+                    "lo": 713970
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 930828
+                        "lo": 713970
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 930828
+                            "lo": 713970
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 930828
+                                  "lo": 713970
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 930828
+                                  "lo": 713970
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 930828
+                            "lo": 713970
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 930828
+                            "lo": 713970
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 713970
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 930828
+                          "lo": 713970
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 23227
+                          "lo": 93211
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.244.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.244.json
index dc33ff45..a0302e01 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.244.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.244.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 413901
+                    "lo": 629852
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 375061
+                    "lo": 18491
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 413901
+                    "lo": 629852
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 413901
+                        "lo": 629852
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 413901
+                            "lo": 629852
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 413901
+                                  "lo": 629852
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 413901
+                                  "lo": 629852
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 413901
+                            "lo": 629852
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 413901
+                            "lo": 629852
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 629852
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 413901
+                          "lo": 629852
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 375061
+                          "lo": 18491
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.245.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.245.json
index 9567b3fc..d66b931d 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.245.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.245.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 62417
+                    "lo": 659786
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 567180
+                    "lo": 922647
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 62417
+                    "lo": 659786
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 62417
+                        "lo": 659786
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 62417
+                            "lo": 659786
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 62417
+                                  "lo": 659786
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 62417
+                                  "lo": 659786
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 62417
+                            "lo": 659786
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 62417
+                            "lo": 659786
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 659786
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 62417
+                          "lo": 659786
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 567180
+                          "lo": 922647
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.246.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.246.json
index 703732b4..f537f4c2 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.246.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.246.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 649798
+                    "lo": 780579
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 202393
+                    "lo": 310770
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 649798
+                    "lo": 780579
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 649798
+                        "lo": 780579
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 649798
+                            "lo": 780579
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 649798
+                                  "lo": 780579
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 649798
+                                  "lo": 780579
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 649798
+                            "lo": 780579
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 649798
+                            "lo": 780579
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 780579
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 649798
+                          "lo": 780579
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 202393
+                          "lo": 310770
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.247.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.247.json
index 9b7c30e9..1ff08b45 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.247.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.247.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 253691
+                    "lo": 893790
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 83925
+                    "lo": 203394
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 253691
+                    "lo": 893790
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 253691
+                        "lo": 893790
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 253691
+                            "lo": 893790
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 253691
+                                  "lo": 893790
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 253691
+                                  "lo": 893790
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 253691
+                            "lo": 893790
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 253691
+                            "lo": 893790
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 893790
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 253691
+                          "lo": 893790
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 83925
+                          "lo": 203394
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.248.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.248.json
index 37466571..78826f4c 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.248.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.248.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 545147
+                    "lo": 803322
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 923474
+                    "lo": 910923
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 545147
+                    "lo": 803322
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 545147
+                        "lo": 803322
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 545147
+                            "lo": 803322
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 545147
+                                  "lo": 803322
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 545147
+                                  "lo": 803322
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 545147
+                            "lo": 803322
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 545147
+                            "lo": 803322
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 803322
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 545147
+                          "lo": 803322
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 923474
+                          "lo": 910923
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.249.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.249.json
index f24b53d9..ea63be78 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.249.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.249.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 552673
+                    "lo": 104193
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 865158
+                    "lo": 148132
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 552673
+                    "lo": 104193
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 552673
+                        "lo": 104193
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 552673
+                            "lo": 104193
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 552673
+                                  "lo": 104193
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 552673
+                                  "lo": 104193
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 552673
+                            "lo": 104193
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 552673
+                            "lo": 104193
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 104193
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 552673
+                          "lo": 104193
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 865158
+                          "lo": 148132
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.25.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.25.json
index 053d26e9..62563bcc 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.25.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.25.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 361993
+                    "lo": 10069
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 737373
+                    "lo": 455062
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 361993
+                    "lo": 10069
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 361993
+                        "lo": 10069
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 361993
+                            "lo": 10069
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 361993
+                                  "lo": 10069
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 361993
+                                  "lo": 10069
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 361993
+                            "lo": 10069
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 361993
+                            "lo": 10069
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 10069
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 361993
+                          "lo": 10069
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 737373
+                          "lo": 455062
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.250.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.250.json
index 9f0ab01e..5f45c03b 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.250.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.250.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 100062
+                    "lo": 375609
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 908715
+                    "lo": 295061
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 100062
+                    "lo": 375609
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 100062
+                        "lo": 375609
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 100062
+                            "lo": 375609
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 100062
+                                  "lo": 375609
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 100062
+                                  "lo": 375609
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 100062
+                            "lo": 375609
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 100062
+                            "lo": 375609
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 375609
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 100062
+                          "lo": 375609
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 908715
+                          "lo": 295061
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.251.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.251.json
index dfaad421..b8aac1f9 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.251.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.251.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 485866
+                    "lo": 465745
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 885342
+                    "lo": 225264
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 485866
+                    "lo": 465745
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 485866
+                        "lo": 465745
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 485866
+                            "lo": 465745
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 485866
+                                  "lo": 465745
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 485866
+                                  "lo": 465745
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 485866
+                            "lo": 465745
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 485866
+                            "lo": 465745
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 465745
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 485866
+                          "lo": 465745
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 885342
+                          "lo": 225264
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.252.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.252.json
index 57972400..0650482c 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.252.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.252.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 151397
+                    "lo": 972578
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 606457
+                    "lo": 341720
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 151397
+                    "lo": 972578
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 151397
+                        "lo": 972578
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 151397
+                            "lo": 972578
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 151397
+                                  "lo": 972578
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 151397
+                                  "lo": 972578
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 151397
+                            "lo": 972578
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 151397
+                            "lo": 972578
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 972578
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 151397
+                          "lo": 972578
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 606457
+                          "lo": 341720
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.253.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.253.json
index e07e4979..4110ad80 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.253.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.253.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 381013
+                    "lo": 688152
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 446378
+                    "lo": 486405
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 381013
+                    "lo": 688152
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 381013
+                        "lo": 688152
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 381013
+                            "lo": 688152
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 381013
+                                  "lo": 688152
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 381013
+                                  "lo": 688152
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 381013
+                            "lo": 688152
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 381013
+                            "lo": 688152
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 688152
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 381013
+                          "lo": 688152
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 446378
+                          "lo": 486405
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.254.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.254.json
index 0def48f6..3f570f8b 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.254.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.254.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 272375
+                    "lo": 402517
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 95229
+                    "lo": 570719
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 272375
+                    "lo": 402517
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 272375
+                        "lo": 402517
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 272375
+                            "lo": 402517
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 272375
+                                  "lo": 402517
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 272375
+                                  "lo": 402517
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 272375
+                            "lo": 402517
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 272375
+                            "lo": 402517
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 402517
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 272375
+                          "lo": 402517
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 95229
+                          "lo": 570719
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.255.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.255.json
index 0436a67e..6c011fb1 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.255.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.255.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 46715
+                    "lo": 419226
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 400475
+                    "lo": 763470
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 46715
+                    "lo": 419226
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 46715
+                        "lo": 419226
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 46715
+                            "lo": 419226
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 46715
+                                  "lo": 419226
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 46715
+                                  "lo": 419226
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 46715
+                            "lo": 419226
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 46715
+                            "lo": 419226
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 419226
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 46715
+                          "lo": 419226
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 400475
+                          "lo": 763470
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.256.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.256.json
index 53cfb3dd..ea53d42d 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.256.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.256.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 380982
+                    "lo": 169710
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 327774
+                    "lo": 206575
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 380982
+                    "lo": 169710
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 380982
+                        "lo": 169710
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 380982
+                            "lo": 169710
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 380982
+                                  "lo": 169710
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 380982
+                                  "lo": 169710
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 380982
+                            "lo": 169710
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 380982
+                            "lo": 169710
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 169710
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 380982
+                          "lo": 169710
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 327774
+                          "lo": 206575
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.257.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.257.json
index e491b2f9..9d239c58 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.257.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.257.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 45322
+                    "lo": 966301
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 959739
+                    "lo": 860873
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 45322
+                    "lo": 966301
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 45322
+                        "lo": 966301
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 45322
+                            "lo": 966301
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 45322
+                                  "lo": 966301
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 45322
+                                  "lo": 966301
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 45322
+                            "lo": 966301
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 45322
+                            "lo": 966301
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 966301
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 45322
+                          "lo": 966301
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 959739
+                          "lo": 860873
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.26.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.26.json
index 563fca48..dd76bd2e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.26.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.26.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 633
+                    "lo": 126496
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 501120
+                    "lo": 94691
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 633
+                    "lo": 126496
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 633
+                        "lo": 126496
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 633
+                            "lo": 126496
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 633
+                                  "lo": 126496
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 633
+                                  "lo": 126496
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 633
+                            "lo": 126496
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 633
+                            "lo": 126496
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 126496
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 633
+                          "lo": 126496
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 501120
+                          "lo": 94691
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.27.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.27.json
index 9720c004..1f4785ef 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.27.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.27.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 964946
+                    "lo": 672817
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 467779
+                    "lo": 301929
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 964946
+                    "lo": 672817
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 964946
+                        "lo": 672817
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 964946
+                            "lo": 672817
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 964946
+                                  "lo": 672817
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 964946
+                                  "lo": 672817
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 964946
+                            "lo": 672817
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 964946
+                            "lo": 672817
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 672817
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 964946
+                          "lo": 672817
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 467779
+                          "lo": 301929
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.28.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.28.json
index faae0913..1c6cfcf8 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.28.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.28.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 672948
+                    "lo": 339733
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 632891
+                    "lo": 3863
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 672948
+                    "lo": 339733
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 672948
+                        "lo": 339733
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 672948
+                            "lo": 339733
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 672948
+                                  "lo": 339733
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 672948
+                                  "lo": 339733
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 672948
+                            "lo": 339733
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 672948
+                            "lo": 339733
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 339733
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 672948
+                          "lo": 339733
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 632891
+                          "lo": 3863
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.29.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.29.json
index 0e2bcf60..0806e22b 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.29.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.29.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 127856
+                    "lo": 129398
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 130949
+                    "lo": 401710
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 127856
+                    "lo": 129398
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 127856
+                        "lo": 129398
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 127856
+                            "lo": 129398
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 127856
+                                  "lo": 129398
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 127856
+                                  "lo": 129398
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 127856
+                            "lo": 129398
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 127856
+                            "lo": 129398
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 129398
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 127856
+                          "lo": 129398
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 130949
+                          "lo": 401710
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.3.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.3.json
index 5786bf9e..d24ecd09 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.3.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.3.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 614635
+                    "lo": 864933
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 303442
+                    "lo": 731624
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 614635
+                    "lo": 864933
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 614635
+                        "lo": 864933
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 614635
+                            "lo": 864933
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 614635
+                                  "lo": 864933
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 614635
+                                  "lo": 864933
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 614635
+                            "lo": 864933
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 614635
+                            "lo": 864933
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 864933
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 614635
+                          "lo": 864933
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 303442
+                          "lo": 731624
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.30.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.30.json
index 7e82da07..c120ed69 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.30.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.30.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 20703
+                    "lo": 877433
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 340492
+                    "lo": 734668
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 20703
+                    "lo": 877433
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 20703
+                        "lo": 877433
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 20703
+                            "lo": 877433
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 20703
+                                  "lo": 877433
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 20703
+                                  "lo": 877433
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 20703
+                            "lo": 877433
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 20703
+                            "lo": 877433
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 877433
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 20703
+                          "lo": 877433
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 340492
+                          "lo": 734668
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.31.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.31.json
index 4bfb3cc5..dd9ce950 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.31.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.31.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 570748
+                    "lo": 10243
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 231525
+                    "lo": 749765
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 570748
+                    "lo": 10243
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 570748
+                        "lo": 10243
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 570748
+                            "lo": 10243
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 570748
+                                  "lo": 10243
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 570748
+                                  "lo": 10243
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 570748
+                            "lo": 10243
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 570748
+                            "lo": 10243
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 10243
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 570748
+                          "lo": 10243
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 231525
+                          "lo": 749765
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.32.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.32.json
index 791e97e0..7d33bb73 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.32.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.32.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 889635
+                    "lo": 466488
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 716216
+                    "lo": 329146
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 889635
+                    "lo": 466488
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 889635
+                        "lo": 466488
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 889635
+                            "lo": 466488
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 889635
+                                  "lo": 466488
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 889635
+                                  "lo": 466488
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 889635
+                            "lo": 466488
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 889635
+                            "lo": 466488
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 466488
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 889635
+                          "lo": 466488
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 716216
+                          "lo": 329146
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.33.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.33.json
index a762e321..5cc18dce 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.33.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.33.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 949850
+                    "lo": 186418
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 226736
+                    "lo": 744118
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 949850
+                    "lo": 186418
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 949850
+                        "lo": 186418
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 949850
+                            "lo": 186418
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 949850
+                                  "lo": 186418
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 949850
+                                  "lo": 186418
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 949850
+                            "lo": 186418
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 949850
+                            "lo": 186418
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 186418
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 949850
+                          "lo": 186418
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 226736
+                          "lo": 744118
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.34.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.34.json
index 9e9024ed..84128851 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.34.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.34.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 722540
+                    "lo": 67010
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 668269
+                    "lo": 739266
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 722540
+                    "lo": 67010
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 722540
+                        "lo": 67010
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 722540
+                            "lo": 67010
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 722540
+                                  "lo": 67010
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 722540
+                                  "lo": 67010
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 722540
+                            "lo": 67010
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 722540
+                            "lo": 67010
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 67010
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 722540
+                          "lo": 67010
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 668269
+                          "lo": 739266
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.35.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.35.json
index 5d95543e..8b65ece1 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.35.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.35.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 366380
+                    "lo": 77169
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 680594
+                    "lo": 126035
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 366380
+                    "lo": 77169
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 366380
+                        "lo": 77169
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 366380
+                            "lo": 77169
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 366380
+                                  "lo": 77169
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 366380
+                                  "lo": 77169
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 366380
+                            "lo": 77169
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 366380
+                            "lo": 77169
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 77169
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 366380
+                          "lo": 77169
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 680594
+                          "lo": 126035
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.36.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.36.json
index c9a4cf22..7eec35e5 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.36.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.36.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 776089
+                    "lo": 863342
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 309915
+                    "lo": 494399
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 776089
+                    "lo": 863342
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 776089
+                        "lo": 863342
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 776089
+                            "lo": 863342
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 776089
+                                  "lo": 863342
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 776089
+                                  "lo": 863342
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 776089
+                            "lo": 863342
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 776089
+                            "lo": 863342
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 863342
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 776089
+                          "lo": 863342
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 309915
+                          "lo": 494399
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.37.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.37.json
index 1e3fbc60..b3caa40e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.37.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.37.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 896304
+                    "lo": 483590
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 47835
+                    "lo": 858871
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 896304
+                    "lo": 483590
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 896304
+                        "lo": 483590
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 896304
+                            "lo": 483590
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 896304
+                                  "lo": 483590
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 896304
+                                  "lo": 483590
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 896304
+                            "lo": 483590
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 896304
+                            "lo": 483590
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 483590
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 896304
+                          "lo": 483590
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 47835
+                          "lo": 858871
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.38.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.38.json
index 4bd11200..56e41340 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.38.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.38.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 179572
+                    "lo": 954759
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 20827
+                    "lo": 520437
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 179572
+                    "lo": 954759
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 179572
+                        "lo": 954759
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 179572
+                            "lo": 954759
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 179572
+                                  "lo": 954759
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 179572
+                                  "lo": 954759
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 179572
+                            "lo": 954759
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 179572
+                            "lo": 954759
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 954759
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 179572
+                          "lo": 954759
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 20827
+                          "lo": 520437
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.39.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.39.json
index b5eb5e9a..2d118b22 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.39.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.39.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 257877
+                    "lo": 719001
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 310537
+                    "lo": 111446
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 257877
+                    "lo": 719001
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 257877
+                        "lo": 719001
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 257877
+                            "lo": 719001
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 257877
+                                  "lo": 719001
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 257877
+                                  "lo": 719001
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 257877
+                            "lo": 719001
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 257877
+                            "lo": 719001
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 719001
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 257877
+                          "lo": 719001
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 310537
+                          "lo": 111446
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.4.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.4.json
index 7aa25527..24108b4b 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.4.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.4.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 500429
+                    "lo": 373816
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 519386
+                    "lo": 665343
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 500429
+                    "lo": 373816
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 500429
+                        "lo": 373816
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 500429
+                            "lo": 373816
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 500429
+                                  "lo": 373816
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 500429
+                                  "lo": 373816
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 500429
+                            "lo": 373816
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 500429
+                            "lo": 373816
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 373816
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 500429
+                          "lo": 373816
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 519386
+                          "lo": 665343
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.40.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.40.json
index a2a199d9..c5573e10 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.40.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.40.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 573191
+                    "lo": 731342
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 889777
+                    "lo": 884269
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 573191
+                    "lo": 731342
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 573191
+                        "lo": 731342
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 573191
+                            "lo": 731342
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 573191
+                                  "lo": 731342
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 573191
+                                  "lo": 731342
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 573191
+                            "lo": 731342
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 573191
+                            "lo": 731342
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 731342
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 573191
+                          "lo": 731342
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 889777
+                          "lo": 884269
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.41.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.41.json
index ad3eeac7..178bf619 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.41.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.41.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 76134
+                    "lo": 786969
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 156298
+                    "lo": 418900
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 76134
+                    "lo": 786969
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 76134
+                        "lo": 786969
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 76134
+                            "lo": 786969
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 76134
+                                  "lo": 786969
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 76134
+                                  "lo": 786969
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 76134
+                            "lo": 786969
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 76134
+                            "lo": 786969
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 786969
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 76134
+                          "lo": 786969
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 156298
+                          "lo": 418900
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.42.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.42.json
index bf7a496c..377f33d9 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.42.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.42.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 234914
+                    "lo": 381586
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 924828
+                    "lo": 690784
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 234914
+                    "lo": 381586
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 234914
+                        "lo": 381586
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 234914
+                            "lo": 381586
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 234914
+                                  "lo": 381586
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 234914
+                                  "lo": 381586
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 234914
+                            "lo": 381586
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 234914
+                            "lo": 381586
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 381586
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 234914
+                          "lo": 381586
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 924828
+                          "lo": 690784
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.43.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.43.json
index 48d2d39d..87f6cd34 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.43.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.43.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 282290
+                    "lo": 817306
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 360565
+                    "lo": 251738
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 282290
+                    "lo": 817306
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 282290
+                        "lo": 817306
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 282290
+                            "lo": 817306
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 282290
+                                  "lo": 817306
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 282290
+                                  "lo": 817306
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 282290
+                            "lo": 817306
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 282290
+                            "lo": 817306
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 817306
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 282290
+                          "lo": 817306
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 360565
+                          "lo": 251738
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.44.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.44.json
index bcbac680..9b27d972 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.44.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.44.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 758529
+                    "lo": 735113
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 789360
+                    "lo": 218971
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 758529
+                    "lo": 735113
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 758529
+                        "lo": 735113
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 758529
+                            "lo": 735113
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 758529
+                                  "lo": 735113
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 758529
+                                  "lo": 735113
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 758529
+                            "lo": 735113
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 758529
+                            "lo": 735113
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 735113
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 758529
+                          "lo": 735113
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 789360
+                          "lo": 218971
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.45.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.45.json
index dea15199..c3ba44aa 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.45.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.45.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 209784
+                    "lo": 294256
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 957636
+                    "lo": 992735
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 209784
+                    "lo": 294256
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 209784
+                        "lo": 294256
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 209784
+                            "lo": 294256
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 209784
+                                  "lo": 294256
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 209784
+                                  "lo": 294256
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 209784
+                            "lo": 294256
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 209784
+                            "lo": 294256
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 294256
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 209784
+                          "lo": 294256
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 957636
+                          "lo": 992735
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.46.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.46.json
index 3e22ca5e..0a1cda5b 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.46.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.46.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 640285
+                    "lo": 251091
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 591124
+                    "lo": 733666
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 640285
+                    "lo": 251091
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 640285
+                        "lo": 251091
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 640285
+                            "lo": 251091
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 640285
+                                  "lo": 251091
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 640285
+                                  "lo": 251091
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 640285
+                            "lo": 251091
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 640285
+                            "lo": 251091
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 251091
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 640285
+                          "lo": 251091
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 591124
+                          "lo": 733666
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.47.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.47.json
index d742fd08..17170e96 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.47.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.47.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 850116
+                    "lo": 849499
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 757777
+                    "lo": 823123
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 850116
+                    "lo": 849499
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 850116
+                        "lo": 849499
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 850116
+                            "lo": 849499
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 850116
+                                  "lo": 849499
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 850116
+                                  "lo": 849499
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 850116
+                            "lo": 849499
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 850116
+                            "lo": 849499
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 849499
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 850116
+                          "lo": 849499
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 757777
+                          "lo": 823123
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.48.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.48.json
index 5fce1179..10cfe5d4 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.48.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.48.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 55319
+                    "lo": 619956
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 194617
+                    "lo": 211105
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 55319
+                    "lo": 619956
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 55319
+                        "lo": 619956
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 55319
+                            "lo": 619956
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 55319
+                                  "lo": 619956
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 55319
+                                  "lo": 619956
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 55319
+                            "lo": 619956
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 55319
+                            "lo": 619956
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 619956
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 55319
+                          "lo": 619956
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 194617
+                          "lo": 211105
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.49.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.49.json
index 630ec4a1..1dd8f761 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.49.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.49.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 250615
+                    "lo": 307359
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 568764
+                    "lo": 167285
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 250615
+                    "lo": 307359
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 250615
+                        "lo": 307359
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 250615
+                            "lo": 307359
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 250615
+                                  "lo": 307359
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 250615
+                                  "lo": 307359
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 250615
+                            "lo": 307359
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 250615
+                            "lo": 307359
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 307359
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 250615
+                          "lo": 307359
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 568764
+                          "lo": 167285
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.5.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.5.json
index 3640742f..ce10552f 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.5.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.5.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 997327
+                    "lo": 195420
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 471585
+                    "lo": 941128
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 997327
+                    "lo": 195420
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 997327
+                        "lo": 195420
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 997327
+                            "lo": 195420
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 997327
+                                  "lo": 195420
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 997327
+                                  "lo": 195420
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 997327
+                            "lo": 195420
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 997327
+                            "lo": 195420
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 195420
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 997327
+                          "lo": 195420
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 471585
+                          "lo": 941128
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.50.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.50.json
index dfb0f067..35f6ca55 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.50.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.50.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 485072
+                    "lo": 736581
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 176172
+                    "lo": 895988
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 485072
+                    "lo": 736581
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 485072
+                        "lo": 736581
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 485072
+                            "lo": 736581
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 485072
+                                  "lo": 736581
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 485072
+                                  "lo": 736581
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 485072
+                            "lo": 736581
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 485072
+                            "lo": 736581
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 736581
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 485072
+                          "lo": 736581
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 176172
+                          "lo": 895988
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.51.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.51.json
index b2dd8dff..555eb7bd 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.51.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.51.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 286386
+                    "lo": 398699
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 884763
+                    "lo": 337389
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 286386
+                    "lo": 398699
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 286386
+                        "lo": 398699
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 286386
+                            "lo": 398699
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 286386
+                                  "lo": 398699
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 286386
+                                  "lo": 398699
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 286386
+                            "lo": 398699
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 286386
+                            "lo": 398699
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 398699
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 286386
+                          "lo": 398699
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 884763
+                          "lo": 337389
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.52.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.52.json
index 4984b7cc..7cef2ce0 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.52.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.52.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 686286
+                    "lo": 242090
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 149211
+                    "lo": 252010
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 686286
+                    "lo": 242090
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 686286
+                        "lo": 242090
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 686286
+                            "lo": 242090
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 686286
+                                  "lo": 242090
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 686286
+                                  "lo": 242090
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 686286
+                            "lo": 242090
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 686286
+                            "lo": 242090
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 242090
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 686286
+                          "lo": 242090
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 149211
+                          "lo": 252010
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.53.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.53.json
index c67a9a5f..7fa7f516 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.53.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.53.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 84104
+                    "lo": 868701
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 718968
+                    "lo": 589261
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 84104
+                    "lo": 868701
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 84104
+                        "lo": 868701
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 84104
+                            "lo": 868701
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 84104
+                                  "lo": 868701
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 84104
+                                  "lo": 868701
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 84104
+                            "lo": 868701
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 84104
+                            "lo": 868701
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 868701
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 84104
+                          "lo": 868701
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 718968
+                          "lo": 589261
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.54.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.54.json
index 4a9eec18..fe5c127b 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.54.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.54.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 177268
+                    "lo": 987182
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 964164
+                    "lo": 830618
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 177268
+                    "lo": 987182
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 177268
+                        "lo": 987182
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 177268
+                            "lo": 987182
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 177268
+                                  "lo": 987182
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 177268
+                                  "lo": 987182
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 177268
+                            "lo": 987182
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 177268
+                            "lo": 987182
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 987182
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 177268
+                          "lo": 987182
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 964164
+                          "lo": 830618
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.55.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.55.json
index 1e514bad..050de846 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.55.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.55.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 465736
+                    "lo": 917971
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 979988
+                    "lo": 272470
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 465736
+                    "lo": 917971
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 465736
+                        "lo": 917971
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 465736
+                            "lo": 917971
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 465736
+                                  "lo": 917971
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 465736
+                                  "lo": 917971
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 465736
+                            "lo": 917971
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 465736
+                            "lo": 917971
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 917971
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 465736
+                          "lo": 917971
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 979988
+                          "lo": 272470
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.56.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.56.json
index 0a047d44..44e0c738 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.56.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.56.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 901072
+                    "lo": 26269
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 396533
+                    "lo": 18393
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 901072
+                    "lo": 26269
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 901072
+                        "lo": 26269
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 901072
+                            "lo": 26269
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 901072
+                                  "lo": 26269
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 901072
+                                  "lo": 26269
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 901072
+                            "lo": 26269
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 901072
+                            "lo": 26269
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 26269
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 901072
+                          "lo": 26269
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 396533
+                          "lo": 18393
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.57.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.57.json
index 2db5d10e..6ea488c7 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.57.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.57.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 551098
+                    "lo": 365564
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 757005
+                    "lo": 190748
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 551098
+                    "lo": 365564
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 551098
+                        "lo": 365564
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 551098
+                            "lo": 365564
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 551098
+                                  "lo": 365564
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 551098
+                                  "lo": 365564
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 551098
+                            "lo": 365564
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 551098
+                            "lo": 365564
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 365564
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 551098
+                          "lo": 365564
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 757005
+                          "lo": 190748
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.58.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.58.json
index cef7d909..5aba1242 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.58.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.58.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 36898
+                    "lo": 695396
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 687943
+                    "lo": 27061
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 36898
+                    "lo": 695396
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 36898
+                        "lo": 695396
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 36898
+                            "lo": 695396
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 36898
+                                  "lo": 695396
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 36898
+                                  "lo": 695396
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 36898
+                            "lo": 695396
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 36898
+                            "lo": 695396
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 695396
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 36898
+                          "lo": 695396
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 687943
+                          "lo": 27061
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.59.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.59.json
index 579ba03b..0b1d4e08 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.59.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.59.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 38880
+                    "lo": 933496
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 968467
+                    "lo": 232909
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 38880
+                    "lo": 933496
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 38880
+                        "lo": 933496
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 38880
+                            "lo": 933496
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 38880
+                                  "lo": 933496
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 38880
+                                  "lo": 933496
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 38880
+                            "lo": 933496
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 38880
+                            "lo": 933496
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 933496
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 38880
+                          "lo": 933496
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 968467
+                          "lo": 232909
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.6.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.6.json
index fc07feeb..f7a64800 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.6.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.6.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 941888
+                    "lo": 148849
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 396505
+                    "lo": 752475
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 941888
+                    "lo": 148849
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 941888
+                        "lo": 148849
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 941888
+                            "lo": 148849
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 941888
+                                  "lo": 148849
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 941888
+                                  "lo": 148849
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 941888
+                            "lo": 148849
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 941888
+                            "lo": 148849
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 148849
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 941888
+                          "lo": 148849
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 396505
+                          "lo": 752475
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.60.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.60.json
index 4f48140c..fd790159 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.60.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.60.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 386068
+                    "lo": 797145
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 532814
+                    "lo": 145213
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 386068
+                    "lo": 797145
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 386068
+                        "lo": 797145
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 386068
+                            "lo": 797145
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 386068
+                                  "lo": 797145
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 386068
+                                  "lo": 797145
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 386068
+                            "lo": 797145
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 386068
+                            "lo": 797145
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 797145
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 386068
+                          "lo": 797145
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 532814
+                          "lo": 145213
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.61.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.61.json
index bb52b8aa..c2a500e9 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.61.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.61.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 827357
+                    "lo": 273855
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 934266
+                    "lo": 156909
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 827357
+                    "lo": 273855
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 827357
+                        "lo": 273855
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 827357
+                            "lo": 273855
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 827357
+                                  "lo": 273855
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 827357
+                                  "lo": 273855
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 827357
+                            "lo": 273855
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 827357
+                            "lo": 273855
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 273855
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 827357
+                          "lo": 273855
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 934266
+                          "lo": 156909
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.62.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.62.json
index 83421bc5..4f4f9d8f 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.62.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.62.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 263684
+                    "lo": 890346
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 406223
+                    "lo": 464533
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 263684
+                    "lo": 890346
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 263684
+                        "lo": 890346
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 263684
+                            "lo": 890346
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 263684
+                                  "lo": 890346
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 263684
+                                  "lo": 890346
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 263684
+                            "lo": 890346
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 263684
+                            "lo": 890346
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 890346
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 263684
+                          "lo": 890346
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 406223
+                          "lo": 464533
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.63.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.63.json
index 25197daa..cedc5134 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.63.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.63.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 262365
+                    "lo": 627754
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 924741
+                    "lo": 20480
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 262365
+                    "lo": 627754
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 262365
+                        "lo": 627754
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 262365
+                            "lo": 627754
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 262365
+                                  "lo": 627754
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 262365
+                                  "lo": 627754
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 262365
+                            "lo": 627754
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 262365
+                            "lo": 627754
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 627754
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 262365
+                          "lo": 627754
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 924741
+                          "lo": 20480
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.64.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.64.json
index d90fa5ba..97154be3 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.64.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.64.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 48112
+                    "lo": 239399
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 495360
+                    "lo": 688177
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 48112
+                    "lo": 239399
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 48112
+                        "lo": 239399
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 48112
+                            "lo": 239399
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 48112
+                                  "lo": 239399
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 48112
+                                  "lo": 239399
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 48112
+                            "lo": 239399
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 48112
+                            "lo": 239399
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 239399
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 48112
+                          "lo": 239399
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 495360
+                          "lo": 688177
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.65.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.65.json
index c0110a2d..895f41be 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.65.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.65.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 578520
+                    "lo": 474949
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 89170
+                    "lo": 243176
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 578520
+                    "lo": 474949
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 578520
+                        "lo": 474949
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 578520
+                            "lo": 474949
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 578520
+                                  "lo": 474949
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 578520
+                                  "lo": 474949
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 578520
+                            "lo": 474949
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 578520
+                            "lo": 474949
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 474949
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 578520
+                          "lo": 474949
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 89170
+                          "lo": 243176
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.66.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.66.json
index 3bec7607..840e8671 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.66.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.66.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 409910
+                    "lo": 397409
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 350385
+                    "lo": 76238
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 409910
+                    "lo": 397409
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 409910
+                        "lo": 397409
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 409910
+                            "lo": 397409
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 409910
+                                  "lo": 397409
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 409910
+                                  "lo": 397409
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 409910
+                            "lo": 397409
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 409910
+                            "lo": 397409
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 397409
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 409910
+                          "lo": 397409
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 350385
+                          "lo": 76238
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.67.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.67.json
index 016b253b..7c72cc2e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.67.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.67.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 68801
+                    "lo": 385600
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 698146
+                    "lo": 524485
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 68801
+                    "lo": 385600
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 68801
+                        "lo": 385600
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 68801
+                            "lo": 385600
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 68801
+                                  "lo": 385600
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 68801
+                                  "lo": 385600
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 68801
+                            "lo": 385600
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 68801
+                            "lo": 385600
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 385600
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 68801
+                          "lo": 385600
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 698146
+                          "lo": 524485
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.68.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.68.json
index ba678ba6..f2a3b650 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.68.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.68.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 56340
+                    "lo": 414806
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 5604
+                    "lo": 769182
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 56340
+                    "lo": 414806
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 56340
+                        "lo": 414806
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 56340
+                            "lo": 414806
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 56340
+                                  "lo": 414806
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 56340
+                                  "lo": 414806
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 56340
+                            "lo": 414806
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 56340
+                            "lo": 414806
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 414806
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 56340
+                          "lo": 414806
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 5604
+                          "lo": 769182
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.69.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.69.json
index f66ba93e..8ddac31f 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.69.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.69.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 2105
+                    "lo": 371869
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 912627
+                    "lo": 683704
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 2105
+                    "lo": 371869
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 2105
+                        "lo": 371869
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 2105
+                            "lo": 371869
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 2105
+                                  "lo": 371869
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 2105
+                                  "lo": 371869
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 2105
+                            "lo": 371869
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 2105
+                            "lo": 371869
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 371869
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 2105
+                          "lo": 371869
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 912627
+                          "lo": 683704
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.7.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.7.json
index 609e8a0c..03896611 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.7.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.7.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 411378
+                    "lo": 71671
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 937552
+                    "lo": 500066
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 411378
+                    "lo": 71671
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 411378
+                        "lo": 71671
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 411378
+                            "lo": 71671
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 411378
+                                  "lo": 71671
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 411378
+                                  "lo": 71671
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 411378
+                            "lo": 71671
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 411378
+                            "lo": 71671
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 71671
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 411378
+                          "lo": 71671
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 937552
+                          "lo": 500066
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.70.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.70.json
index e6b31143..5c423413 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.70.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.70.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 108306
+                    "lo": 74401
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 823934
+                    "lo": 256853
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 108306
+                    "lo": 74401
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 108306
+                        "lo": 74401
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 108306
+                            "lo": 74401
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 108306
+                                  "lo": 74401
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 108306
+                                  "lo": 74401
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 108306
+                            "lo": 74401
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 108306
+                            "lo": 74401
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 74401
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 108306
+                          "lo": 74401
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 823934
+                          "lo": 256853
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.71.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.71.json
index 2af60203..2bd2dbe7 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.71.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.71.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 970587
+                    "lo": 664254
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 535173
+                    "lo": 442860
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 970587
+                    "lo": 664254
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 970587
+                        "lo": 664254
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 970587
+                            "lo": 664254
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 970587
+                                  "lo": 664254
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 970587
+                                  "lo": 664254
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 970587
+                            "lo": 664254
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 970587
+                            "lo": 664254
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 664254
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 970587
+                          "lo": 664254
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 535173
+                          "lo": 442860
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.72.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.72.json
index de4756e8..4daff874 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.72.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.72.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 945492
+                    "lo": 653622
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 590083
+                    "lo": 836215
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 945492
+                    "lo": 653622
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 945492
+                        "lo": 653622
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 945492
+                            "lo": 653622
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 945492
+                                  "lo": 653622
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 945492
+                                  "lo": 653622
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 945492
+                            "lo": 653622
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 945492
+                            "lo": 653622
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 653622
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 945492
+                          "lo": 653622
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 590083
+                          "lo": 836215
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.73.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.73.json
index cec273ac..f75313e6 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.73.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.73.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 886911
+                    "lo": 614720
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 275902
+                    "lo": 916651
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 886911
+                    "lo": 614720
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 886911
+                        "lo": 614720
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 886911
+                            "lo": 614720
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 886911
+                                  "lo": 614720
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 886911
+                                  "lo": 614720
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 886911
+                            "lo": 614720
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 886911
+                            "lo": 614720
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 614720
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 886911
+                          "lo": 614720
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 275902
+                          "lo": 916651
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.74.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.74.json
index 6b0277ba..5678b973 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.74.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.74.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 263050
+                    "lo": 578802
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 7376
+                    "lo": 922414
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 263050
+                    "lo": 578802
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 263050
+                        "lo": 578802
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 263050
+                            "lo": 578802
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 263050
+                                  "lo": 578802
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 263050
+                                  "lo": 578802
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 263050
+                            "lo": 578802
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 263050
+                            "lo": 578802
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 578802
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 263050
+                          "lo": 578802
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 7376
+                          "lo": 922414
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.75.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.75.json
index 5e351d33..7fa383cf 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.75.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.75.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 365335
+                    "lo": 459006
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 527499
+                    "lo": 866361
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 365335
+                    "lo": 459006
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 365335
+                        "lo": 459006
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 365335
+                            "lo": 459006
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 365335
+                                  "lo": 459006
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 365335
+                                  "lo": 459006
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 365335
+                            "lo": 459006
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 365335
+                            "lo": 459006
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 459006
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 365335
+                          "lo": 459006
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 527499
+                          "lo": 866361
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.76.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.76.json
index b5185e3d..64e57bc8 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.76.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.76.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 464219
+                    "lo": 990745
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 175623
+                    "lo": 526528
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 464219
+                    "lo": 990745
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 464219
+                        "lo": 990745
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 464219
+                            "lo": 990745
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 464219
+                                  "lo": 990745
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 464219
+                                  "lo": 990745
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 464219
+                            "lo": 990745
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 464219
+                            "lo": 990745
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 990745
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 464219
+                          "lo": 990745
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 175623
+                          "lo": 526528
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.77.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.77.json
index d8de1e8d..d2c66ee6 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.77.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.77.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 748009
+                    "lo": 290636
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 64405
+                    "lo": 392364
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 748009
+                    "lo": 290636
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 748009
+                        "lo": 290636
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 748009
+                            "lo": 290636
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 748009
+                                  "lo": 290636
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 748009
+                                  "lo": 290636
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 748009
+                            "lo": 290636
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 748009
+                            "lo": 290636
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 290636
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 748009
+                          "lo": 290636
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 64405
+                          "lo": 392364
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.78.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.78.json
index 2cfdb6e2..38ec75ab 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.78.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.78.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 596498
+                    "lo": 565877
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 123165
+                    "lo": 985689
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 596498
+                    "lo": 565877
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 596498
+                        "lo": 565877
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 596498
+                            "lo": 565877
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 596498
+                                  "lo": 565877
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 596498
+                                  "lo": 565877
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 596498
+                            "lo": 565877
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 596498
+                            "lo": 565877
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 565877
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 596498
+                          "lo": 565877
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 123165
+                          "lo": 985689
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.79.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.79.json
index 9c23b590..90baf109 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.79.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.79.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 261086
+                    "lo": 593949
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 657542
+                    "lo": 438305
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 261086
+                    "lo": 593949
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 261086
+                        "lo": 593949
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 261086
+                            "lo": 593949
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 261086
+                                  "lo": 593949
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 261086
+                                  "lo": 593949
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 261086
+                            "lo": 593949
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 261086
+                            "lo": 593949
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 593949
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 261086
+                          "lo": 593949
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 657542
+                          "lo": 438305
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.8.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.8.json
index 7f7001ce..4b7169cf 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.8.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.8.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 849310
+                    "lo": 13912
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 19842
+                    "lo": 817892
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 849310
+                    "lo": 13912
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 849310
+                        "lo": 13912
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 849310
+                            "lo": 13912
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 849310
+                                  "lo": 13912
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 849310
+                                  "lo": 13912
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 849310
+                            "lo": 13912
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 849310
+                            "lo": 13912
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 13912
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 849310
+                          "lo": 13912
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 19842
+                          "lo": 817892
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.80.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.80.json
index da39cab7..37e57b03 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.80.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.80.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 255833
+                    "lo": 418300
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 79669
+                    "lo": 235066
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 255833
+                    "lo": 418300
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 255833
+                        "lo": 418300
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 255833
+                            "lo": 418300
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 255833
+                                  "lo": 418300
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 255833
+                                  "lo": 418300
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 255833
+                            "lo": 418300
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 255833
+                            "lo": 418300
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 418300
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 255833
+                          "lo": 418300
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 79669
+                          "lo": 235066
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.81.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.81.json
index a46cf3f9..ed84b9d0 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.81.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.81.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 636349
+                    "lo": 709334
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 709138
+                    "lo": 611663
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 636349
+                    "lo": 709334
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 636349
+                        "lo": 709334
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 636349
+                            "lo": 709334
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 636349
+                                  "lo": 709334
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 636349
+                                  "lo": 709334
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 636349
+                            "lo": 709334
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 636349
+                            "lo": 709334
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 709334
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 636349
+                          "lo": 709334
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 709138
+                          "lo": 611663
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.82.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.82.json
index 3ace1343..38feb3aa 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.82.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.82.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 841244
+                    "lo": 344456
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 175566
+                    "lo": 956014
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 841244
+                    "lo": 344456
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 841244
+                        "lo": 344456
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 841244
+                            "lo": 344456
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 841244
+                                  "lo": 344456
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 841244
+                                  "lo": 344456
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 841244
+                            "lo": 344456
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 841244
+                            "lo": 344456
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 344456
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 841244
+                          "lo": 344456
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 175566
+                          "lo": 956014
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.83.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.83.json
index aa831fdf..30d23ebe 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.83.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.83.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 38998
+                    "lo": 430810
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 959883
+                    "lo": 670304
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 38998
+                    "lo": 430810
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 38998
+                        "lo": 430810
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 38998
+                            "lo": 430810
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 38998
+                                  "lo": 430810
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 38998
+                                  "lo": 430810
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 38998
+                            "lo": 430810
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 38998
+                            "lo": 430810
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 430810
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 38998
+                          "lo": 430810
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 959883
+                          "lo": 670304
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.84.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.84.json
index a41875f3..ea5e4a6d 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.84.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.84.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 118261
+                    "lo": 165261
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 35380
+                    "lo": 564853
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 118261
+                    "lo": 165261
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 118261
+                        "lo": 165261
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 118261
+                            "lo": 165261
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 118261
+                                  "lo": 165261
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 118261
+                                  "lo": 165261
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 118261
+                            "lo": 165261
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 118261
+                            "lo": 165261
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 165261
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 118261
+                          "lo": 165261
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 35380
+                          "lo": 564853
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.85.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.85.json
index 3a1d7e4c..dbfd8ef4 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.85.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.85.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 888675
+                    "lo": 183566
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 41177
+                    "lo": 169766
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 888675
+                    "lo": 183566
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 888675
+                        "lo": 183566
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 888675
+                            "lo": 183566
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 888675
+                                  "lo": 183566
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 888675
+                                  "lo": 183566
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 888675
+                            "lo": 183566
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 888675
+                            "lo": 183566
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 183566
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 888675
+                          "lo": 183566
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 41177
+                          "lo": 169766
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.86.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.86.json
index 84827283..ea47d382 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.86.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.86.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 528037
+                    "lo": 886953
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 970395
+                    "lo": 947231
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 528037
+                    "lo": 886953
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 528037
+                        "lo": 886953
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 528037
+                            "lo": 886953
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 528037
+                                  "lo": 886953
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 528037
+                                  "lo": 886953
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 528037
+                            "lo": 886953
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 528037
+                            "lo": 886953
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 886953
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 528037
+                          "lo": 886953
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 970395
+                          "lo": 947231
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.87.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.87.json
index 95319821..c0513f8e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.87.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.87.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 721437
+                    "lo": 30070
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 818738
+                    "lo": 397556
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 721437
+                    "lo": 30070
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 721437
+                        "lo": 30070
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 721437
+                            "lo": 30070
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 721437
+                                  "lo": 30070
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 721437
+                                  "lo": 30070
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 721437
+                            "lo": 30070
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 721437
+                            "lo": 30070
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 30070
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 721437
+                          "lo": 30070
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 818738
+                          "lo": 397556
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.88.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.88.json
index 5f938dfd..4ee10503 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.88.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.88.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 721141
+                    "lo": 716406
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 510555
+                    "lo": 212723
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 721141
+                    "lo": 716406
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 721141
+                        "lo": 716406
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 721141
+                            "lo": 716406
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 721141
+                                  "lo": 716406
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 721141
+                                  "lo": 716406
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 721141
+                            "lo": 716406
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 721141
+                            "lo": 716406
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 716406
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 721141
+                          "lo": 716406
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 510555
+                          "lo": 212723
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.89.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.89.json
index 95c0e655..aa4fbecf 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.89.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.89.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 953753
+                    "lo": 234749
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 437121
+                    "lo": 516100
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 953753
+                    "lo": 234749
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 953753
+                        "lo": 234749
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 953753
+                            "lo": 234749
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 953753
+                                  "lo": 234749
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 953753
+                                  "lo": 234749
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 953753
+                            "lo": 234749
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 953753
+                            "lo": 234749
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 234749
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 953753
+                          "lo": 234749
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 437121
+                          "lo": 516100
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.9.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.9.json
index 5b13fab7..e5e8681e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.9.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.9.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 402626
+                    "lo": 755687
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 370563
+                    "lo": 900743
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 402626
+                    "lo": 755687
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 402626
+                        "lo": 755687
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 402626
+                            "lo": 755687
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 402626
+                                  "lo": 755687
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 402626
+                                  "lo": 755687
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 402626
+                            "lo": 755687
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 402626
+                            "lo": 755687
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 755687
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 402626
+                          "lo": 755687
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 370563
+                          "lo": 900743
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.90.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.90.json
index 4968fe1f..533c6081 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.90.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.90.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 953604
+                    "lo": 432983
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 160198
+                    "lo": 324743
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 953604
+                    "lo": 432983
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 953604
+                        "lo": 432983
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 953604
+                            "lo": 432983
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 953604
+                                  "lo": 432983
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 953604
+                                  "lo": 432983
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 953604
+                            "lo": 432983
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 953604
+                            "lo": 432983
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 432983
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 953604
+                          "lo": 432983
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 160198
+                          "lo": 324743
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.91.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.91.json
index 6e4710f3..6f092d32 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.91.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.91.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 276972
+                    "lo": 701579
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 356743
+                    "lo": 241312
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 276972
+                    "lo": 701579
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 276972
+                        "lo": 701579
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 276972
+                            "lo": 701579
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 276972
+                                  "lo": 701579
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 276972
+                                  "lo": 701579
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 276972
+                            "lo": 701579
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 276972
+                            "lo": 701579
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 701579
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 276972
+                          "lo": 701579
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 356743
+                          "lo": 241312
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.92.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.92.json
index 812c18bb..062f961b 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.92.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.92.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 604845
+                    "lo": 666071
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 340935
+                    "lo": 351521
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 604845
+                    "lo": 666071
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 604845
+                        "lo": 666071
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 604845
+                            "lo": 666071
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 604845
+                                  "lo": 666071
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 604845
+                                  "lo": 666071
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 604845
+                            "lo": 666071
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 604845
+                            "lo": 666071
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 666071
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 604845
+                          "lo": 666071
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 340935
+                          "lo": 351521
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.93.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.93.json
index ff31e644..860b3f55 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.93.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.93.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 970118
+                    "lo": 767474
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 596467
+                    "lo": 392290
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 970118
+                    "lo": 767474
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 970118
+                        "lo": 767474
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 970118
+                            "lo": 767474
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 970118
+                                  "lo": 767474
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 970118
+                                  "lo": 767474
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 970118
+                            "lo": 767474
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 970118
+                            "lo": 767474
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 767474
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 970118
+                          "lo": 767474
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 596467
+                          "lo": 392290
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.94.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.94.json
index 803585e3..27d88ad2 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.94.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.94.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 31329
+                    "lo": 699757
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 966758
+                    "lo": 987983
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 31329
+                    "lo": 699757
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 31329
+                        "lo": 699757
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 31329
+                            "lo": 699757
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 31329
+                                  "lo": 699757
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 31329
+                                  "lo": 699757
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 31329
+                            "lo": 699757
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 31329
+                            "lo": 699757
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 699757
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 31329
+                          "lo": 699757
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 966758
+                          "lo": 987983
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.95.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.95.json
index 5f7b9939..46850137 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.95.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.95.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 742542
+                    "lo": 112950
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 466013
+                    "lo": 756608
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 742542
+                    "lo": 112950
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 742542
+                        "lo": 112950
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 742542
+                            "lo": 112950
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 742542
+                                  "lo": 112950
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 742542
+                                  "lo": 112950
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 742542
+                            "lo": 112950
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 742542
+                            "lo": 112950
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 112950
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 742542
+                          "lo": 112950
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 466013
+                          "lo": 756608
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.96.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.96.json
index 6410e58a..1f2135a6 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.96.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.96.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 793253
+                    "lo": 787832
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 986604
+                    "lo": 311664
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 793253
+                    "lo": 787832
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 793253
+                        "lo": 787832
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 793253
+                            "lo": 787832
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 793253
+                                  "lo": 787832
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 793253
+                                  "lo": 787832
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 793253
+                            "lo": 787832
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 793253
+                            "lo": 787832
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 787832
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 793253
+                          "lo": 787832
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 986604
+                          "lo": 311664
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.97.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.97.json
index 9e62d7e7..cf9d5340 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.97.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.97.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 478643
+                    "lo": 510335
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 728628
+                    "lo": 181254
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 478643
+                    "lo": 510335
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 478643
+                        "lo": 510335
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 478643
+                            "lo": 510335
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 478643
+                                  "lo": 510335
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 478643
+                                  "lo": 510335
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 478643
+                            "lo": 510335
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 478643
+                            "lo": 510335
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 510335
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 478643
+                          "lo": 510335
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 728628
+                          "lo": 181254
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.98.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.98.json
index f3d2374a..a583d429 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.98.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.98.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 202130
+                    "lo": 621582
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 104980
+                    "lo": 903102
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 202130
+                    "lo": 621582
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 202130
+                        "lo": 621582
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 202130
+                            "lo": 621582
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 202130
+                                  "lo": 621582
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 202130
+                                  "lo": 621582
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 202130
+                            "lo": 621582
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 202130
+                            "lo": 621582
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 621582
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 202130
+                          "lo": 621582
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 104980
+                          "lo": 903102
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.99.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.99.json
index 3d5f9a24..44c0d89d 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.99.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_contract_calculate_round_trip.99.json
@@ -40,7 +40,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 757545
+                    "lo": 929740
                   }
                 }
               ]
@@ -65,7 +65,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 359477
+                    "lo": 414519
                   }
                 }
               ]
@@ -90,7 +90,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 757545
+                    "lo": 929740
                   }
                 }
               ]
@@ -112,7 +112,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 757545
+                        "lo": 929740
                       }
                     }
                   ]
@@ -289,16 +289,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -340,7 +344,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 757545
+                            "lo": 929740
                           }
                         }
                       },
@@ -369,7 +373,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 757545
+                                  "lo": 929740
                                 }
                               }
                             },
@@ -380,7 +384,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 757545
+                                  "lo": 929740
                                 }
                               }
                             }
@@ -410,7 +414,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 757545
+                            "lo": 929740
                           }
                         }
                       },
@@ -425,7 +429,25 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 757545
+                            "lo": 929740
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 929740
                           }
                         }
                       }
@@ -516,7 +538,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 757545
+                          "lo": 929740
                         }
                       }
                     },
@@ -662,7 +684,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 359477
+                          "lo": 414519
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.1.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.1.json
index 340efdd8..c36a815a 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.1.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.1.json
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -369,6 +373,24 @@
                             "lo": 12704220813055513276
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 4315479778372110092,
+                            "lo": 12704220813055513276
+                          }
+                        }
                       }
                     ]
                   }
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.10.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.10.json
index 66caa7ff..82931ace 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.10.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.10.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7376542643339617185,
-                    "lo": 342922183163342207
+                    "hi": 3003744185087855970,
+                    "lo": 17987154246856039727
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7376542643339617185,
-                    "lo": 342922183163342207
+                    "hi": 3003744185087855970,
+                    "lo": 17987154246856039727
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 7376542643339617185,
-                        "lo": 342922183163342207
+                        "hi": 3003744185087855970,
+                        "lo": 17987154246856039727
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7376542643339617185,
-                            "lo": 342922183163342207
+                            "hi": 3003744185087855970,
+                            "lo": 17987154246856039727
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7376542643339617185,
-                                  "lo": 342922183163342207
+                                  "hi": 3003744185087855970,
+                                  "lo": 17987154246856039727
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7376542643339617185,
-                                  "lo": 342922183163342207
+                                  "hi": 3003744185087855970,
+                                  "lo": 17987154246856039727
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7376542643339617185,
-                            "lo": 342922183163342207
+                            "hi": 3003744185087855970,
+                            "lo": 17987154246856039727
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7376542643339617185,
-                            "lo": 342922183163342207
+                            "hi": 3003744185087855970,
+                            "lo": 17987154246856039727
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 3003744185087855970,
+                            "lo": 17987154246856039727
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 7376542643339617185,
-                          "lo": 342922183163342207
+                          "hi": 3003744185087855970,
+                          "lo": 17987154246856039727
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.100.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.100.json
index ff27f33a..502de2a5 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.100.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.100.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4692264315949913853,
-                    "lo": 12185114697497444674
+                    "hi": 1649191830387622472,
+                    "lo": 10624443504087882131
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4692264315949913853,
-                    "lo": 12185114697497444674
+                    "hi": 1649191830387622472,
+                    "lo": 10624443504087882131
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4692264315949913853,
-                        "lo": 12185114697497444674
+                        "hi": 1649191830387622472,
+                        "lo": 10624443504087882131
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4692264315949913853,
-                            "lo": 12185114697497444674
+                            "hi": 1649191830387622472,
+                            "lo": 10624443504087882131
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4692264315949913853,
-                                  "lo": 12185114697497444674
+                                  "hi": 1649191830387622472,
+                                  "lo": 10624443504087882131
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4692264315949913853,
-                                  "lo": 12185114697497444674
+                                  "hi": 1649191830387622472,
+                                  "lo": 10624443504087882131
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4692264315949913853,
-                            "lo": 12185114697497444674
+                            "hi": 1649191830387622472,
+                            "lo": 10624443504087882131
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4692264315949913853,
-                            "lo": 12185114697497444674
+                            "hi": 1649191830387622472,
+                            "lo": 10624443504087882131
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 1649191830387622472,
+                            "lo": 10624443504087882131
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4692264315949913853,
-                          "lo": 12185114697497444674
+                          "hi": 1649191830387622472,
+                          "lo": 10624443504087882131
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.101.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.101.json
index 2d6485f8..b0520b92 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.101.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.101.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8757518722550684646,
-                    "lo": 1856851450436212065
+                    "hi": 3643427263895241160,
+                    "lo": 5253047081983171256
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8757518722550684646,
-                    "lo": 1856851450436212065
+                    "hi": 3643427263895241160,
+                    "lo": 5253047081983171256
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 8757518722550684646,
-                        "lo": 1856851450436212065
+                        "hi": 3643427263895241160,
+                        "lo": 5253047081983171256
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8757518722550684646,
-                            "lo": 1856851450436212065
+                            "hi": 3643427263895241160,
+                            "lo": 5253047081983171256
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8757518722550684646,
-                                  "lo": 1856851450436212065
+                                  "hi": 3643427263895241160,
+                                  "lo": 5253047081983171256
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8757518722550684646,
-                                  "lo": 1856851450436212065
+                                  "hi": 3643427263895241160,
+                                  "lo": 5253047081983171256
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8757518722550684646,
-                            "lo": 1856851450436212065
+                            "hi": 3643427263895241160,
+                            "lo": 5253047081983171256
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8757518722550684646,
-                            "lo": 1856851450436212065
+                            "hi": 3643427263895241160,
+                            "lo": 5253047081983171256
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 3643427263895241160,
+                            "lo": 5253047081983171256
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 8757518722550684646,
-                          "lo": 1856851450436212065
+                          "hi": 3643427263895241160,
+                          "lo": 5253047081983171256
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.102.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.102.json
index 295fc27b..d29eee71 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.102.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.102.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4958092922502757494,
-                    "lo": 10304486395302695659
+                    "hi": 7878023289353277876,
+                    "lo": 9084897509378334493
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4958092922502757494,
-                    "lo": 10304486395302695659
+                    "hi": 7878023289353277876,
+                    "lo": 9084897509378334493
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4958092922502757494,
-                        "lo": 10304486395302695659
+                        "hi": 7878023289353277876,
+                        "lo": 9084897509378334493
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4958092922502757494,
-                            "lo": 10304486395302695659
+                            "hi": 7878023289353277876,
+                            "lo": 9084897509378334493
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4958092922502757494,
-                                  "lo": 10304486395302695659
+                                  "hi": 7878023289353277876,
+                                  "lo": 9084897509378334493
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4958092922502757494,
-                                  "lo": 10304486395302695659
+                                  "hi": 7878023289353277876,
+                                  "lo": 9084897509378334493
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4958092922502757494,
-                            "lo": 10304486395302695659
+                            "hi": 7878023289353277876,
+                            "lo": 9084897509378334493
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4958092922502757494,
-                            "lo": 10304486395302695659
+                            "hi": 7878023289353277876,
+                            "lo": 9084897509378334493
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 7878023289353277876,
+                            "lo": 9084897509378334493
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4958092922502757494,
-                          "lo": 10304486395302695659
+                          "hi": 7878023289353277876,
+                          "lo": 9084897509378334493
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.103.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.103.json
index 4a2764ef..0f8aee51 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.103.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.103.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1351236816373667101,
-                    "lo": 1720710590484960912
+                    "hi": 5179621354907793470,
+                    "lo": 2363451221878519549
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1351236816373667101,
-                    "lo": 1720710590484960912
+                    "hi": 5179621354907793470,
+                    "lo": 2363451221878519549
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 1351236816373667101,
-                        "lo": 1720710590484960912
+                        "hi": 5179621354907793470,
+                        "lo": 2363451221878519549
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1351236816373667101,
-                            "lo": 1720710590484960912
+                            "hi": 5179621354907793470,
+                            "lo": 2363451221878519549
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 1351236816373667101,
-                                  "lo": 1720710590484960912
+                                  "hi": 5179621354907793470,
+                                  "lo": 2363451221878519549
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 1351236816373667101,
-                                  "lo": 1720710590484960912
+                                  "hi": 5179621354907793470,
+                                  "lo": 2363451221878519549
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1351236816373667101,
-                            "lo": 1720710590484960912
+                            "hi": 5179621354907793470,
+                            "lo": 2363451221878519549
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1351236816373667101,
-                            "lo": 1720710590484960912
+                            "hi": 5179621354907793470,
+                            "lo": 2363451221878519549
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 5179621354907793470,
+                            "lo": 2363451221878519549
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 1351236816373667101,
-                          "lo": 1720710590484960912
+                          "hi": 5179621354907793470,
+                          "lo": 2363451221878519549
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.104.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.104.json
index 8fd57ae2..38bb2870 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.104.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.104.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6049793202801087804,
-                    "lo": 2691943196332453563
+                    "hi": 875621188787651890,
+                    "lo": 4296975261295374314
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6049793202801087804,
-                    "lo": 2691943196332453563
+                    "hi": 875621188787651890,
+                    "lo": 4296975261295374314
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 6049793202801087804,
-                        "lo": 2691943196332453563
+                        "hi": 875621188787651890,
+                        "lo": 4296975261295374314
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6049793202801087804,
-                            "lo": 2691943196332453563
+                            "hi": 875621188787651890,
+                            "lo": 4296975261295374314
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6049793202801087804,
-                                  "lo": 2691943196332453563
+                                  "hi": 875621188787651890,
+                                  "lo": 4296975261295374314
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6049793202801087804,
-                                  "lo": 2691943196332453563
+                                  "hi": 875621188787651890,
+                                  "lo": 4296975261295374314
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6049793202801087804,
-                            "lo": 2691943196332453563
+                            "hi": 875621188787651890,
+                            "lo": 4296975261295374314
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6049793202801087804,
-                            "lo": 2691943196332453563
+                            "hi": 875621188787651890,
+                            "lo": 4296975261295374314
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 875621188787651890,
+                            "lo": 4296975261295374314
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 6049793202801087804,
-                          "lo": 2691943196332453563
+                          "hi": 875621188787651890,
+                          "lo": 4296975261295374314
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.105.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.105.json
index 076f22f9..7f74f2f5 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.105.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.105.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4465959984388289309,
-                    "lo": 12422141656182801659
+                    "hi": 5442708469984423417,
+                    "lo": 2283165508628244499
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4465959984388289309,
-                    "lo": 12422141656182801659
+                    "hi": 5442708469984423417,
+                    "lo": 2283165508628244499
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4465959984388289309,
-                        "lo": 12422141656182801659
+                        "hi": 5442708469984423417,
+                        "lo": 2283165508628244499
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4465959984388289309,
-                            "lo": 12422141656182801659
+                            "hi": 5442708469984423417,
+                            "lo": 2283165508628244499
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4465959984388289309,
-                                  "lo": 12422141656182801659
+                                  "hi": 5442708469984423417,
+                                  "lo": 2283165508628244499
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4465959984388289309,
-                                  "lo": 12422141656182801659
+                                  "hi": 5442708469984423417,
+                                  "lo": 2283165508628244499
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4465959984388289309,
-                            "lo": 12422141656182801659
+                            "hi": 5442708469984423417,
+                            "lo": 2283165508628244499
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4465959984388289309,
-                            "lo": 12422141656182801659
+                            "hi": 5442708469984423417,
+                            "lo": 2283165508628244499
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 5442708469984423417,
+                            "lo": 2283165508628244499
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4465959984388289309,
-                          "lo": 12422141656182801659
+                          "hi": 5442708469984423417,
+                          "lo": 2283165508628244499
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.106.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.106.json
index c298bc24..0c71b02d 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.106.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.106.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2733674185942913658,
-                    "lo": 9030094547578495109
+                    "hi": 9003359634768313387,
+                    "lo": 9256456219980437759
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2733674185942913658,
-                    "lo": 9030094547578495109
+                    "hi": 9003359634768313387,
+                    "lo": 9256456219980437759
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 2733674185942913658,
-                        "lo": 9030094547578495109
+                        "hi": 9003359634768313387,
+                        "lo": 9256456219980437759
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2733674185942913658,
-                            "lo": 9030094547578495109
+                            "hi": 9003359634768313387,
+                            "lo": 9256456219980437759
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2733674185942913658,
-                                  "lo": 9030094547578495109
+                                  "hi": 9003359634768313387,
+                                  "lo": 9256456219980437759
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2733674185942913658,
-                                  "lo": 9030094547578495109
+                                  "hi": 9003359634768313387,
+                                  "lo": 9256456219980437759
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2733674185942913658,
-                            "lo": 9030094547578495109
+                            "hi": 9003359634768313387,
+                            "lo": 9256456219980437759
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2733674185942913658,
-                            "lo": 9030094547578495109
+                            "hi": 9003359634768313387,
+                            "lo": 9256456219980437759
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 9003359634768313387,
+                            "lo": 9256456219980437759
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 2733674185942913658,
-                          "lo": 9030094547578495109
+                          "hi": 9003359634768313387,
+                          "lo": 9256456219980437759
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.107.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.107.json
index c50db064..22497077 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.107.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.107.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 956061767776340804,
-                    "lo": 9216515058596329569
+                    "hi": 973704378145798328,
+                    "lo": 13939661271193550571
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 956061767776340804,
-                    "lo": 9216515058596329569
+                    "hi": 973704378145798328,
+                    "lo": 13939661271193550571
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 956061767776340804,
-                        "lo": 9216515058596329569
+                        "hi": 973704378145798328,
+                        "lo": 13939661271193550571
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 956061767776340804,
-                            "lo": 9216515058596329569
+                            "hi": 973704378145798328,
+                            "lo": 13939661271193550571
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 956061767776340804,
-                                  "lo": 9216515058596329569
+                                  "hi": 973704378145798328,
+                                  "lo": 13939661271193550571
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 956061767776340804,
-                                  "lo": 9216515058596329569
+                                  "hi": 973704378145798328,
+                                  "lo": 13939661271193550571
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 956061767776340804,
-                            "lo": 9216515058596329569
+                            "hi": 973704378145798328,
+                            "lo": 13939661271193550571
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 956061767776340804,
-                            "lo": 9216515058596329569
+                            "hi": 973704378145798328,
+                            "lo": 13939661271193550571
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 973704378145798328,
+                            "lo": 13939661271193550571
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 956061767776340804,
-                          "lo": 9216515058596329569
+                          "hi": 973704378145798328,
+                          "lo": 13939661271193550571
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.108.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.108.json
index b4b2e5b6..009a60a5 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.108.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.108.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2264443029435009187,
-                    "lo": 1538331034009910005
+                    "hi": 3008078550148362522,
+                    "lo": 17470440908208482120
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2264443029435009187,
-                    "lo": 1538331034009910005
+                    "hi": 3008078550148362522,
+                    "lo": 17470440908208482120
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 2264443029435009187,
-                        "lo": 1538331034009910005
+                        "hi": 3008078550148362522,
+                        "lo": 17470440908208482120
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2264443029435009187,
-                            "lo": 1538331034009910005
+                            "hi": 3008078550148362522,
+                            "lo": 17470440908208482120
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2264443029435009187,
-                                  "lo": 1538331034009910005
+                                  "hi": 3008078550148362522,
+                                  "lo": 17470440908208482120
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2264443029435009187,
-                                  "lo": 1538331034009910005
+                                  "hi": 3008078550148362522,
+                                  "lo": 17470440908208482120
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2264443029435009187,
-                            "lo": 1538331034009910005
+                            "hi": 3008078550148362522,
+                            "lo": 17470440908208482120
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2264443029435009187,
-                            "lo": 1538331034009910005
+                            "hi": 3008078550148362522,
+                            "lo": 17470440908208482120
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 3008078550148362522,
+                            "lo": 17470440908208482120
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 2264443029435009187,
-                          "lo": 1538331034009910005
+                          "hi": 3008078550148362522,
+                          "lo": 17470440908208482120
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.109.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.109.json
index ba585d5b..3b45e946 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.109.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.109.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3406281857496125430,
-                    "lo": 17876020089254554368
+                    "hi": 6738979164559477743,
+                    "lo": 14599692693498839249
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3406281857496125430,
-                    "lo": 17876020089254554368
+                    "hi": 6738979164559477743,
+                    "lo": 14599692693498839249
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 3406281857496125430,
-                        "lo": 17876020089254554368
+                        "hi": 6738979164559477743,
+                        "lo": 14599692693498839249
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3406281857496125430,
-                            "lo": 17876020089254554368
+                            "hi": 6738979164559477743,
+                            "lo": 14599692693498839249
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3406281857496125430,
-                                  "lo": 17876020089254554368
+                                  "hi": 6738979164559477743,
+                                  "lo": 14599692693498839249
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3406281857496125430,
-                                  "lo": 17876020089254554368
+                                  "hi": 6738979164559477743,
+                                  "lo": 14599692693498839249
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3406281857496125430,
-                            "lo": 17876020089254554368
+                            "hi": 6738979164559477743,
+                            "lo": 14599692693498839249
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3406281857496125430,
-                            "lo": 17876020089254554368
+                            "hi": 6738979164559477743,
+                            "lo": 14599692693498839249
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 6738979164559477743,
+                            "lo": 14599692693498839249
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 3406281857496125430,
-                          "lo": 17876020089254554368
+                          "hi": 6738979164559477743,
+                          "lo": 14599692693498839249
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.11.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.11.json
index 1f63cfe1..c75a517d 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.11.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.11.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4214451608232680582,
-                    "lo": 13994397416083386197
+                    "hi": 8047473568355026943,
+                    "lo": 6968147634741081941
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4214451608232680582,
-                    "lo": 13994397416083386197
+                    "hi": 8047473568355026943,
+                    "lo": 6968147634741081941
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4214451608232680582,
-                        "lo": 13994397416083386197
+                        "hi": 8047473568355026943,
+                        "lo": 6968147634741081941
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4214451608232680582,
-                            "lo": 13994397416083386197
+                            "hi": 8047473568355026943,
+                            "lo": 6968147634741081941
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4214451608232680582,
-                                  "lo": 13994397416083386197
+                                  "hi": 8047473568355026943,
+                                  "lo": 6968147634741081941
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4214451608232680582,
-                                  "lo": 13994397416083386197
+                                  "hi": 8047473568355026943,
+                                  "lo": 6968147634741081941
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4214451608232680582,
-                            "lo": 13994397416083386197
+                            "hi": 8047473568355026943,
+                            "lo": 6968147634741081941
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4214451608232680582,
-                            "lo": 13994397416083386197
+                            "hi": 8047473568355026943,
+                            "lo": 6968147634741081941
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 8047473568355026943,
+                            "lo": 6968147634741081941
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4214451608232680582,
-                          "lo": 13994397416083386197
+                          "hi": 8047473568355026943,
+                          "lo": 6968147634741081941
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.110.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.110.json
index d8bc03f3..f2499137 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.110.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.110.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1057289976526477030,
-                    "lo": 9593780604427660443
+                    "hi": 3336552974718701706,
+                    "lo": 16511112047013892414
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1057289976526477030,
-                    "lo": 9593780604427660443
+                    "hi": 3336552974718701706,
+                    "lo": 16511112047013892414
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 1057289976526477030,
-                        "lo": 9593780604427660443
+                        "hi": 3336552974718701706,
+                        "lo": 16511112047013892414
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1057289976526477030,
-                            "lo": 9593780604427660443
+                            "hi": 3336552974718701706,
+                            "lo": 16511112047013892414
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 1057289976526477030,
-                                  "lo": 9593780604427660443
+                                  "hi": 3336552974718701706,
+                                  "lo": 16511112047013892414
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 1057289976526477030,
-                                  "lo": 9593780604427660443
+                                  "hi": 3336552974718701706,
+                                  "lo": 16511112047013892414
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1057289976526477030,
-                            "lo": 9593780604427660443
+                            "hi": 3336552974718701706,
+                            "lo": 16511112047013892414
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1057289976526477030,
-                            "lo": 9593780604427660443
+                            "hi": 3336552974718701706,
+                            "lo": 16511112047013892414
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 3336552974718701706,
+                            "lo": 16511112047013892414
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 1057289976526477030,
-                          "lo": 9593780604427660443
+                          "hi": 3336552974718701706,
+                          "lo": 16511112047013892414
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.111.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.111.json
index 412752d3..4f91bb61 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.111.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.111.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8455168388023300606,
-                    "lo": 14912859737186294072
+                    "hi": 2072919672594989154,
+                    "lo": 3663660341511588012
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8455168388023300606,
-                    "lo": 14912859737186294072
+                    "hi": 2072919672594989154,
+                    "lo": 3663660341511588012
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 8455168388023300606,
-                        "lo": 14912859737186294072
+                        "hi": 2072919672594989154,
+                        "lo": 3663660341511588012
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8455168388023300606,
-                            "lo": 14912859737186294072
+                            "hi": 2072919672594989154,
+                            "lo": 3663660341511588012
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8455168388023300606,
-                                  "lo": 14912859737186294072
+                                  "hi": 2072919672594989154,
+                                  "lo": 3663660341511588012
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8455168388023300606,
-                                  "lo": 14912859737186294072
+                                  "hi": 2072919672594989154,
+                                  "lo": 3663660341511588012
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8455168388023300606,
-                            "lo": 14912859737186294072
+                            "hi": 2072919672594989154,
+                            "lo": 3663660341511588012
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8455168388023300606,
-                            "lo": 14912859737186294072
+                            "hi": 2072919672594989154,
+                            "lo": 3663660341511588012
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 2072919672594989154,
+                            "lo": 3663660341511588012
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 8455168388023300606,
-                          "lo": 14912859737186294072
+                          "hi": 2072919672594989154,
+                          "lo": 3663660341511588012
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.112.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.112.json
index 9f57b0b9..7a7dcc33 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.112.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.112.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6235575730361444693,
-                    "lo": 5445106723657631800
+                    "hi": 9058285050405727276,
+                    "lo": 18388560209929552406
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6235575730361444693,
-                    "lo": 5445106723657631800
+                    "hi": 9058285050405727276,
+                    "lo": 18388560209929552406
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 6235575730361444693,
-                        "lo": 5445106723657631800
+                        "hi": 9058285050405727276,
+                        "lo": 18388560209929552406
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6235575730361444693,
-                            "lo": 5445106723657631800
+                            "hi": 9058285050405727276,
+                            "lo": 18388560209929552406
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6235575730361444693,
-                                  "lo": 5445106723657631800
+                                  "hi": 9058285050405727276,
+                                  "lo": 18388560209929552406
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6235575730361444693,
-                                  "lo": 5445106723657631800
+                                  "hi": 9058285050405727276,
+                                  "lo": 18388560209929552406
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6235575730361444693,
-                            "lo": 5445106723657631800
+                            "hi": 9058285050405727276,
+                            "lo": 18388560209929552406
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6235575730361444693,
-                            "lo": 5445106723657631800
+                            "hi": 9058285050405727276,
+                            "lo": 18388560209929552406
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 9058285050405727276,
+                            "lo": 18388560209929552406
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 6235575730361444693,
-                          "lo": 5445106723657631800
+                          "hi": 9058285050405727276,
+                          "lo": 18388560209929552406
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.113.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.113.json
index 1fd2c4fc..a9c94732 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.113.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.113.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1649407584147434273,
-                    "lo": 10640965917421164295
+                    "hi": 8205603988095582838,
+                    "lo": 6505622072498781987
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1649407584147434273,
-                    "lo": 10640965917421164295
+                    "hi": 8205603988095582838,
+                    "lo": 6505622072498781987
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 1649407584147434273,
-                        "lo": 10640965917421164295
+                        "hi": 8205603988095582838,
+                        "lo": 6505622072498781987
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1649407584147434273,
-                            "lo": 10640965917421164295
+                            "hi": 8205603988095582838,
+                            "lo": 6505622072498781987
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 1649407584147434273,
-                                  "lo": 10640965917421164295
+                                  "hi": 8205603988095582838,
+                                  "lo": 6505622072498781987
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 1649407584147434273,
-                                  "lo": 10640965917421164295
+                                  "hi": 8205603988095582838,
+                                  "lo": 6505622072498781987
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1649407584147434273,
-                            "lo": 10640965917421164295
+                            "hi": 8205603988095582838,
+                            "lo": 6505622072498781987
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1649407584147434273,
-                            "lo": 10640965917421164295
+                            "hi": 8205603988095582838,
+                            "lo": 6505622072498781987
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 8205603988095582838,
+                            "lo": 6505622072498781987
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 1649407584147434273,
-                          "lo": 10640965917421164295
+                          "hi": 8205603988095582838,
+                          "lo": 6505622072498781987
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.114.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.114.json
index c7db8ce0..7ae68b62 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.114.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.114.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8893848572682441561,
-                    "lo": 8619679521521308602
+                    "hi": 5493194185131768632,
+                    "lo": 7265498415890114777
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8893848572682441561,
-                    "lo": 8619679521521308602
+                    "hi": 5493194185131768632,
+                    "lo": 7265498415890114777
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 8893848572682441561,
-                        "lo": 8619679521521308602
+                        "hi": 5493194185131768632,
+                        "lo": 7265498415890114777
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8893848572682441561,
-                            "lo": 8619679521521308602
+                            "hi": 5493194185131768632,
+                            "lo": 7265498415890114777
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8893848572682441561,
-                                  "lo": 8619679521521308602
+                                  "hi": 5493194185131768632,
+                                  "lo": 7265498415890114777
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8893848572682441561,
-                                  "lo": 8619679521521308602
+                                  "hi": 5493194185131768632,
+                                  "lo": 7265498415890114777
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8893848572682441561,
-                            "lo": 8619679521521308602
+                            "hi": 5493194185131768632,
+                            "lo": 7265498415890114777
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8893848572682441561,
-                            "lo": 8619679521521308602
+                            "hi": 5493194185131768632,
+                            "lo": 7265498415890114777
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 5493194185131768632,
+                            "lo": 7265498415890114777
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 8893848572682441561,
-                          "lo": 8619679521521308602
+                          "hi": 5493194185131768632,
+                          "lo": 7265498415890114777
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.115.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.115.json
index 168218e3..c8daa8ba 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.115.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.115.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3236972713701957941,
-                    "lo": 5526638385199830610
+                    "hi": 1583081050639822285,
+                    "lo": 1990160946823340493
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3236972713701957941,
-                    "lo": 5526638385199830610
+                    "hi": 1583081050639822285,
+                    "lo": 1990160946823340493
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 3236972713701957941,
-                        "lo": 5526638385199830610
+                        "hi": 1583081050639822285,
+                        "lo": 1990160946823340493
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3236972713701957941,
-                            "lo": 5526638385199830610
+                            "hi": 1583081050639822285,
+                            "lo": 1990160946823340493
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3236972713701957941,
-                                  "lo": 5526638385199830610
+                                  "hi": 1583081050639822285,
+                                  "lo": 1990160946823340493
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3236972713701957941,
-                                  "lo": 5526638385199830610
+                                  "hi": 1583081050639822285,
+                                  "lo": 1990160946823340493
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3236972713701957941,
-                            "lo": 5526638385199830610
+                            "hi": 1583081050639822285,
+                            "lo": 1990160946823340493
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3236972713701957941,
-                            "lo": 5526638385199830610
+                            "hi": 1583081050639822285,
+                            "lo": 1990160946823340493
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 1583081050639822285,
+                            "lo": 1990160946823340493
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 3236972713701957941,
-                          "lo": 5526638385199830610
+                          "hi": 1583081050639822285,
+                          "lo": 1990160946823340493
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.116.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.116.json
index d0002066..99032ec0 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.116.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.116.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2232708332013898561,
-                    "lo": 8588213800291615645
+                    "hi": 5830910143502663629,
+                    "lo": 15021714680464432857
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2232708332013898561,
-                    "lo": 8588213800291615645
+                    "hi": 5830910143502663629,
+                    "lo": 15021714680464432857
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 2232708332013898561,
-                        "lo": 8588213800291615645
+                        "hi": 5830910143502663629,
+                        "lo": 15021714680464432857
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2232708332013898561,
-                            "lo": 8588213800291615645
+                            "hi": 5830910143502663629,
+                            "lo": 15021714680464432857
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2232708332013898561,
-                                  "lo": 8588213800291615645
+                                  "hi": 5830910143502663629,
+                                  "lo": 15021714680464432857
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2232708332013898561,
-                                  "lo": 8588213800291615645
+                                  "hi": 5830910143502663629,
+                                  "lo": 15021714680464432857
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2232708332013898561,
-                            "lo": 8588213800291615645
+                            "hi": 5830910143502663629,
+                            "lo": 15021714680464432857
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2232708332013898561,
-                            "lo": 8588213800291615645
+                            "hi": 5830910143502663629,
+                            "lo": 15021714680464432857
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 5830910143502663629,
+                            "lo": 15021714680464432857
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 2232708332013898561,
-                          "lo": 8588213800291615645
+                          "hi": 5830910143502663629,
+                          "lo": 15021714680464432857
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.117.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.117.json
index 4b59a856..93d88360 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.117.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.117.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4554840510144529059,
-                    "lo": 14914307919983671384
+                    "hi": 6879856789716439046,
+                    "lo": 202676253273969087
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4554840510144529059,
-                    "lo": 14914307919983671384
+                    "hi": 6879856789716439046,
+                    "lo": 202676253273969087
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4554840510144529059,
-                        "lo": 14914307919983671384
+                        "hi": 6879856789716439046,
+                        "lo": 202676253273969087
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4554840510144529059,
-                            "lo": 14914307919983671384
+                            "hi": 6879856789716439046,
+                            "lo": 202676253273969087
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4554840510144529059,
-                                  "lo": 14914307919983671384
+                                  "hi": 6879856789716439046,
+                                  "lo": 202676253273969087
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4554840510144529059,
-                                  "lo": 14914307919983671384
+                                  "hi": 6879856789716439046,
+                                  "lo": 202676253273969087
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4554840510144529059,
-                            "lo": 14914307919983671384
+                            "hi": 6879856789716439046,
+                            "lo": 202676253273969087
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4554840510144529059,
-                            "lo": 14914307919983671384
+                            "hi": 6879856789716439046,
+                            "lo": 202676253273969087
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 6879856789716439046,
+                            "lo": 202676253273969087
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4554840510144529059,
-                          "lo": 14914307919983671384
+                          "hi": 6879856789716439046,
+                          "lo": 202676253273969087
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.118.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.118.json
index 51d2891c..5ad9f8e1 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.118.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.118.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8583582043028294690,
-                    "lo": 9050433526985315027
+                    "hi": 51279303478458088,
+                    "lo": 18275583224508903895
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8583582043028294690,
-                    "lo": 9050433526985315027
+                    "hi": 51279303478458088,
+                    "lo": 18275583224508903895
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 8583582043028294690,
-                        "lo": 9050433526985315027
+                        "hi": 51279303478458088,
+                        "lo": 18275583224508903895
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8583582043028294690,
-                            "lo": 9050433526985315027
+                            "hi": 51279303478458088,
+                            "lo": 18275583224508903895
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8583582043028294690,
-                                  "lo": 9050433526985315027
+                                  "hi": 51279303478458088,
+                                  "lo": 18275583224508903895
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8583582043028294690,
-                                  "lo": 9050433526985315027
+                                  "hi": 51279303478458088,
+                                  "lo": 18275583224508903895
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8583582043028294690,
-                            "lo": 9050433526985315027
+                            "hi": 51279303478458088,
+                            "lo": 18275583224508903895
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8583582043028294690,
-                            "lo": 9050433526985315027
+                            "hi": 51279303478458088,
+                            "lo": 18275583224508903895
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 51279303478458088,
+                            "lo": 18275583224508903895
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 8583582043028294690,
-                          "lo": 9050433526985315027
+                          "hi": 51279303478458088,
+                          "lo": 18275583224508903895
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.119.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.119.json
index 1a13774b..559735dd 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.119.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.119.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1452082546363967897,
-                    "lo": 7296790803771527885
+                    "hi": 5554203864670455614,
+                    "lo": 9477272588002449125
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1452082546363967897,
-                    "lo": 7296790803771527885
+                    "hi": 5554203864670455614,
+                    "lo": 9477272588002449125
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 1452082546363967897,
-                        "lo": 7296790803771527885
+                        "hi": 5554203864670455614,
+                        "lo": 9477272588002449125
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1452082546363967897,
-                            "lo": 7296790803771527885
+                            "hi": 5554203864670455614,
+                            "lo": 9477272588002449125
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 1452082546363967897,
-                                  "lo": 7296790803771527885
+                                  "hi": 5554203864670455614,
+                                  "lo": 9477272588002449125
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 1452082546363967897,
-                                  "lo": 7296790803771527885
+                                  "hi": 5554203864670455614,
+                                  "lo": 9477272588002449125
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1452082546363967897,
-                            "lo": 7296790803771527885
+                            "hi": 5554203864670455614,
+                            "lo": 9477272588002449125
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1452082546363967897,
-                            "lo": 7296790803771527885
+                            "hi": 5554203864670455614,
+                            "lo": 9477272588002449125
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 5554203864670455614,
+                            "lo": 9477272588002449125
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 1452082546363967897,
-                          "lo": 7296790803771527885
+                          "hi": 5554203864670455614,
+                          "lo": 9477272588002449125
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.12.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.12.json
index 72280f41..86bc6b47 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.12.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.12.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8228139552953493601,
-                    "lo": 10109755766169628290
+                    "hi": 3734932138090369017,
+                    "lo": 13619522387533462394
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8228139552953493601,
-                    "lo": 10109755766169628290
+                    "hi": 3734932138090369017,
+                    "lo": 13619522387533462394
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 8228139552953493601,
-                        "lo": 10109755766169628290
+                        "hi": 3734932138090369017,
+                        "lo": 13619522387533462394
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8228139552953493601,
-                            "lo": 10109755766169628290
+                            "hi": 3734932138090369017,
+                            "lo": 13619522387533462394
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8228139552953493601,
-                                  "lo": 10109755766169628290
+                                  "hi": 3734932138090369017,
+                                  "lo": 13619522387533462394
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8228139552953493601,
-                                  "lo": 10109755766169628290
+                                  "hi": 3734932138090369017,
+                                  "lo": 13619522387533462394
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8228139552953493601,
-                            "lo": 10109755766169628290
+                            "hi": 3734932138090369017,
+                            "lo": 13619522387533462394
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8228139552953493601,
-                            "lo": 10109755766169628290
+                            "hi": 3734932138090369017,
+                            "lo": 13619522387533462394
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 3734932138090369017,
+                            "lo": 13619522387533462394
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 8228139552953493601,
-                          "lo": 10109755766169628290
+                          "hi": 3734932138090369017,
+                          "lo": 13619522387533462394
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.120.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.120.json
index c7d81afb..69adab60 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.120.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.120.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5382381471857132041,
-                    "lo": 11191352314564415503
+                    "hi": 4932274760921903211,
+                    "lo": 6228207671822493084
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5382381471857132041,
-                    "lo": 11191352314564415503
+                    "hi": 4932274760921903211,
+                    "lo": 6228207671822493084
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 5382381471857132041,
-                        "lo": 11191352314564415503
+                        "hi": 4932274760921903211,
+                        "lo": 6228207671822493084
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5382381471857132041,
-                            "lo": 11191352314564415503
+                            "hi": 4932274760921903211,
+                            "lo": 6228207671822493084
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5382381471857132041,
-                                  "lo": 11191352314564415503
+                                  "hi": 4932274760921903211,
+                                  "lo": 6228207671822493084
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5382381471857132041,
-                                  "lo": 11191352314564415503
+                                  "hi": 4932274760921903211,
+                                  "lo": 6228207671822493084
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5382381471857132041,
-                            "lo": 11191352314564415503
+                            "hi": 4932274760921903211,
+                            "lo": 6228207671822493084
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5382381471857132041,
-                            "lo": 11191352314564415503
+                            "hi": 4932274760921903211,
+                            "lo": 6228207671822493084
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 4932274760921903211,
+                            "lo": 6228207671822493084
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 5382381471857132041,
-                          "lo": 11191352314564415503
+                          "hi": 4932274760921903211,
+                          "lo": 6228207671822493084
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.121.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.121.json
index d59244cd..ba31c745 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.121.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.121.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 9221877226164155292,
-                    "lo": 15506693648694319248
+                    "hi": 8195249750475595283,
+                    "lo": 14652238140910729611
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 9221877226164155292,
-                    "lo": 15506693648694319248
+                    "hi": 8195249750475595283,
+                    "lo": 14652238140910729611
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 9221877226164155292,
-                        "lo": 15506693648694319248
+                        "hi": 8195249750475595283,
+                        "lo": 14652238140910729611
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 9221877226164155292,
-                            "lo": 15506693648694319248
+                            "hi": 8195249750475595283,
+                            "lo": 14652238140910729611
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 9221877226164155292,
-                                  "lo": 15506693648694319248
+                                  "hi": 8195249750475595283,
+                                  "lo": 14652238140910729611
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 9221877226164155292,
-                                  "lo": 15506693648694319248
+                                  "hi": 8195249750475595283,
+                                  "lo": 14652238140910729611
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 9221877226164155292,
-                            "lo": 15506693648694319248
+                            "hi": 8195249750475595283,
+                            "lo": 14652238140910729611
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 9221877226164155292,
-                            "lo": 15506693648694319248
+                            "hi": 8195249750475595283,
+                            "lo": 14652238140910729611
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 8195249750475595283,
+                            "lo": 14652238140910729611
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 9221877226164155292,
-                          "lo": 15506693648694319248
+                          "hi": 8195249750475595283,
+                          "lo": 14652238140910729611
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.122.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.122.json
index 63e906ec..989b4183 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.122.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.122.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5835721870870815567,
-                    "lo": 16789885745471875014
+                    "hi": 6695600192233876429,
+                    "lo": 840389021425802872
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5835721870870815567,
-                    "lo": 16789885745471875014
+                    "hi": 6695600192233876429,
+                    "lo": 840389021425802872
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 5835721870870815567,
-                        "lo": 16789885745471875014
+                        "hi": 6695600192233876429,
+                        "lo": 840389021425802872
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5835721870870815567,
-                            "lo": 16789885745471875014
+                            "hi": 6695600192233876429,
+                            "lo": 840389021425802872
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5835721870870815567,
-                                  "lo": 16789885745471875014
+                                  "hi": 6695600192233876429,
+                                  "lo": 840389021425802872
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5835721870870815567,
-                                  "lo": 16789885745471875014
+                                  "hi": 6695600192233876429,
+                                  "lo": 840389021425802872
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5835721870870815567,
-                            "lo": 16789885745471875014
+                            "hi": 6695600192233876429,
+                            "lo": 840389021425802872
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5835721870870815567,
-                            "lo": 16789885745471875014
+                            "hi": 6695600192233876429,
+                            "lo": 840389021425802872
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 6695600192233876429,
+                            "lo": 840389021425802872
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 5835721870870815567,
-                          "lo": 16789885745471875014
+                          "hi": 6695600192233876429,
+                          "lo": 840389021425802872
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.123.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.123.json
index a1f550a6..3e68cc06 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.123.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.123.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 445050201489438773,
-                    "lo": 17245150435265193380
+                    "hi": 5803037811140556111,
+                    "lo": 13209011574797338996
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 445050201489438773,
-                    "lo": 17245150435265193380
+                    "hi": 5803037811140556111,
+                    "lo": 13209011574797338996
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 445050201489438773,
-                        "lo": 17245150435265193380
+                        "hi": 5803037811140556111,
+                        "lo": 13209011574797338996
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 445050201489438773,
-                            "lo": 17245150435265193380
+                            "hi": 5803037811140556111,
+                            "lo": 13209011574797338996
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 445050201489438773,
-                                  "lo": 17245150435265193380
+                                  "hi": 5803037811140556111,
+                                  "lo": 13209011574797338996
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 445050201489438773,
-                                  "lo": 17245150435265193380
+                                  "hi": 5803037811140556111,
+                                  "lo": 13209011574797338996
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 445050201489438773,
-                            "lo": 17245150435265193380
+                            "hi": 5803037811140556111,
+                            "lo": 13209011574797338996
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 445050201489438773,
-                            "lo": 17245150435265193380
+                            "hi": 5803037811140556111,
+                            "lo": 13209011574797338996
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 5803037811140556111,
+                            "lo": 13209011574797338996
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 445050201489438773,
-                          "lo": 17245150435265193380
+                          "hi": 5803037811140556111,
+                          "lo": 13209011574797338996
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.124.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.124.json
index 6cc264d9..69439649 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.124.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.124.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6816426135463528673,
-                    "lo": 3971208400253477144
+                    "hi": 1801587115683942885,
+                    "lo": 9332246641579310452
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6816426135463528673,
-                    "lo": 3971208400253477144
+                    "hi": 1801587115683942885,
+                    "lo": 9332246641579310452
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 6816426135463528673,
-                        "lo": 3971208400253477144
+                        "hi": 1801587115683942885,
+                        "lo": 9332246641579310452
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6816426135463528673,
-                            "lo": 3971208400253477144
+                            "hi": 1801587115683942885,
+                            "lo": 9332246641579310452
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6816426135463528673,
-                                  "lo": 3971208400253477144
+                                  "hi": 1801587115683942885,
+                                  "lo": 9332246641579310452
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6816426135463528673,
-                                  "lo": 3971208400253477144
+                                  "hi": 1801587115683942885,
+                                  "lo": 9332246641579310452
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6816426135463528673,
-                            "lo": 3971208400253477144
+                            "hi": 1801587115683942885,
+                            "lo": 9332246641579310452
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6816426135463528673,
-                            "lo": 3971208400253477144
+                            "hi": 1801587115683942885,
+                            "lo": 9332246641579310452
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 1801587115683942885,
+                            "lo": 9332246641579310452
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 6816426135463528673,
-                          "lo": 3971208400253477144
+                          "hi": 1801587115683942885,
+                          "lo": 9332246641579310452
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.125.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.125.json
index f0f41a80..a88fd85e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.125.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.125.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8388728203489028988,
-                    "lo": 8718071403387270876
+                    "hi": 4113513566589085322,
+                    "lo": 15635302215375458784
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8388728203489028988,
-                    "lo": 8718071403387270876
+                    "hi": 4113513566589085322,
+                    "lo": 15635302215375458784
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 8388728203489028988,
-                        "lo": 8718071403387270876
+                        "hi": 4113513566589085322,
+                        "lo": 15635302215375458784
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8388728203489028988,
-                            "lo": 8718071403387270876
+                            "hi": 4113513566589085322,
+                            "lo": 15635302215375458784
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8388728203489028988,
-                                  "lo": 8718071403387270876
+                                  "hi": 4113513566589085322,
+                                  "lo": 15635302215375458784
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8388728203489028988,
-                                  "lo": 8718071403387270876
+                                  "hi": 4113513566589085322,
+                                  "lo": 15635302215375458784
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8388728203489028988,
-                            "lo": 8718071403387270876
+                            "hi": 4113513566589085322,
+                            "lo": 15635302215375458784
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8388728203489028988,
-                            "lo": 8718071403387270876
+                            "hi": 4113513566589085322,
+                            "lo": 15635302215375458784
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 4113513566589085322,
+                            "lo": 15635302215375458784
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 8388728203489028988,
-                          "lo": 8718071403387270876
+                          "hi": 4113513566589085322,
+                          "lo": 15635302215375458784
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.126.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.126.json
index a15ec259..64f9456f 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.126.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.126.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4847485017553537503,
-                    "lo": 5748013112140239832
+                    "hi": 6689869813136479020,
+                    "lo": 86690040499509056
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4847485017553537503,
-                    "lo": 5748013112140239832
+                    "hi": 6689869813136479020,
+                    "lo": 86690040499509056
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4847485017553537503,
-                        "lo": 5748013112140239832
+                        "hi": 6689869813136479020,
+                        "lo": 86690040499509056
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4847485017553537503,
-                            "lo": 5748013112140239832
+                            "hi": 6689869813136479020,
+                            "lo": 86690040499509056
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4847485017553537503,
-                                  "lo": 5748013112140239832
+                                  "hi": 6689869813136479020,
+                                  "lo": 86690040499509056
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4847485017553537503,
-                                  "lo": 5748013112140239832
+                                  "hi": 6689869813136479020,
+                                  "lo": 86690040499509056
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4847485017553537503,
-                            "lo": 5748013112140239832
+                            "hi": 6689869813136479020,
+                            "lo": 86690040499509056
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4847485017553537503,
-                            "lo": 5748013112140239832
+                            "hi": 6689869813136479020,
+                            "lo": 86690040499509056
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 6689869813136479020,
+                            "lo": 86690040499509056
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4847485017553537503,
-                          "lo": 5748013112140239832
+                          "hi": 6689869813136479020,
+                          "lo": 86690040499509056
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.127.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.127.json
index ae46e984..16b0ee88 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.127.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.127.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8585588932669040884,
-                    "lo": 5144072685705121900
+                    "hi": 2358590523004467433,
+                    "lo": 17619624891154280660
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8585588932669040884,
-                    "lo": 5144072685705121900
+                    "hi": 2358590523004467433,
+                    "lo": 17619624891154280660
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 8585588932669040884,
-                        "lo": 5144072685705121900
+                        "hi": 2358590523004467433,
+                        "lo": 17619624891154280660
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8585588932669040884,
-                            "lo": 5144072685705121900
+                            "hi": 2358590523004467433,
+                            "lo": 17619624891154280660
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8585588932669040884,
-                                  "lo": 5144072685705121900
+                                  "hi": 2358590523004467433,
+                                  "lo": 17619624891154280660
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8585588932669040884,
-                                  "lo": 5144072685705121900
+                                  "hi": 2358590523004467433,
+                                  "lo": 17619624891154280660
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8585588932669040884,
-                            "lo": 5144072685705121900
+                            "hi": 2358590523004467433,
+                            "lo": 17619624891154280660
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8585588932669040884,
-                            "lo": 5144072685705121900
+                            "hi": 2358590523004467433,
+                            "lo": 17619624891154280660
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 2358590523004467433,
+                            "lo": 17619624891154280660
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 8585588932669040884,
-                          "lo": 5144072685705121900
+                          "hi": 2358590523004467433,
+                          "lo": 17619624891154280660
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.128.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.128.json
index 1b17b093..4967236f 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.128.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.128.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 377282933934802075,
-                    "lo": 724171383123410779
+                    "hi": 7470700001499653283,
+                    "lo": 3058384171028125798
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 377282933934802075,
-                    "lo": 724171383123410779
+                    "hi": 7470700001499653283,
+                    "lo": 3058384171028125798
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 377282933934802075,
-                        "lo": 724171383123410779
+                        "hi": 7470700001499653283,
+                        "lo": 3058384171028125798
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 377282933934802075,
-                            "lo": 724171383123410779
+                            "hi": 7470700001499653283,
+                            "lo": 3058384171028125798
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 377282933934802075,
-                                  "lo": 724171383123410779
+                                  "hi": 7470700001499653283,
+                                  "lo": 3058384171028125798
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 377282933934802075,
-                                  "lo": 724171383123410779
+                                  "hi": 7470700001499653283,
+                                  "lo": 3058384171028125798
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 377282933934802075,
-                            "lo": 724171383123410779
+                            "hi": 7470700001499653283,
+                            "lo": 3058384171028125798
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 377282933934802075,
-                            "lo": 724171383123410779
+                            "hi": 7470700001499653283,
+                            "lo": 3058384171028125798
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 7470700001499653283,
+                            "lo": 3058384171028125798
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 377282933934802075,
-                          "lo": 724171383123410779
+                          "hi": 7470700001499653283,
+                          "lo": 3058384171028125798
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.129.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.129.json
index 9e3c5049..1e24c8f2 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.129.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.129.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3162459312392275730,
-                    "lo": 5323938914216638303
+                    "hi": 7532502311384363015,
+                    "lo": 3537908880407208782
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3162459312392275730,
-                    "lo": 5323938914216638303
+                    "hi": 7532502311384363015,
+                    "lo": 3537908880407208782
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 3162459312392275730,
-                        "lo": 5323938914216638303
+                        "hi": 7532502311384363015,
+                        "lo": 3537908880407208782
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3162459312392275730,
-                            "lo": 5323938914216638303
+                            "hi": 7532502311384363015,
+                            "lo": 3537908880407208782
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3162459312392275730,
-                                  "lo": 5323938914216638303
+                                  "hi": 7532502311384363015,
+                                  "lo": 3537908880407208782
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3162459312392275730,
-                                  "lo": 5323938914216638303
+                                  "hi": 7532502311384363015,
+                                  "lo": 3537908880407208782
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3162459312392275730,
-                            "lo": 5323938914216638303
+                            "hi": 7532502311384363015,
+                            "lo": 3537908880407208782
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3162459312392275730,
-                            "lo": 5323938914216638303
+                            "hi": 7532502311384363015,
+                            "lo": 3537908880407208782
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 7532502311384363015,
+                            "lo": 3537908880407208782
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 3162459312392275730,
-                          "lo": 5323938914216638303
+                          "hi": 7532502311384363015,
+                          "lo": 3537908880407208782
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.13.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.13.json
index a05ab1c4..dfb7e0d8 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.13.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.13.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3958266878912941298,
-                    "lo": 15895880288056391200
+                    "hi": 5317401372454183738,
+                    "lo": 17234808391399465818
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3958266878912941298,
-                    "lo": 15895880288056391200
+                    "hi": 5317401372454183738,
+                    "lo": 17234808391399465818
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 3958266878912941298,
-                        "lo": 15895880288056391200
+                        "hi": 5317401372454183738,
+                        "lo": 17234808391399465818
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3958266878912941298,
-                            "lo": 15895880288056391200
+                            "hi": 5317401372454183738,
+                            "lo": 17234808391399465818
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3958266878912941298,
-                                  "lo": 15895880288056391200
+                                  "hi": 5317401372454183738,
+                                  "lo": 17234808391399465818
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3958266878912941298,
-                                  "lo": 15895880288056391200
+                                  "hi": 5317401372454183738,
+                                  "lo": 17234808391399465818
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3958266878912941298,
-                            "lo": 15895880288056391200
+                            "hi": 5317401372454183738,
+                            "lo": 17234808391399465818
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3958266878912941298,
-                            "lo": 15895880288056391200
+                            "hi": 5317401372454183738,
+                            "lo": 17234808391399465818
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 5317401372454183738,
+                            "lo": 17234808391399465818
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 3958266878912941298,
-                          "lo": 15895880288056391200
+                          "hi": 5317401372454183738,
+                          "lo": 17234808391399465818
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.130.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.130.json
index 639ef890..1eb602e1 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.130.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.130.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 315362981650517196,
-                    "lo": 15045488167493084373
+                    "hi": 881451485296710717,
+                    "lo": 17500174070869287784
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 315362981650517196,
-                    "lo": 15045488167493084373
+                    "hi": 881451485296710717,
+                    "lo": 17500174070869287784
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 315362981650517196,
-                        "lo": 15045488167493084373
+                        "hi": 881451485296710717,
+                        "lo": 17500174070869287784
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 315362981650517196,
-                            "lo": 15045488167493084373
+                            "hi": 881451485296710717,
+                            "lo": 17500174070869287784
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 315362981650517196,
-                                  "lo": 15045488167493084373
+                                  "hi": 881451485296710717,
+                                  "lo": 17500174070869287784
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 315362981650517196,
-                                  "lo": 15045488167493084373
+                                  "hi": 881451485296710717,
+                                  "lo": 17500174070869287784
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 315362981650517196,
-                            "lo": 15045488167493084373
+                            "hi": 881451485296710717,
+                            "lo": 17500174070869287784
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 315362981650517196,
-                            "lo": 15045488167493084373
+                            "hi": 881451485296710717,
+                            "lo": 17500174070869287784
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 881451485296710717,
+                            "lo": 17500174070869287784
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 315362981650517196,
-                          "lo": 15045488167493084373
+                          "hi": 881451485296710717,
+                          "lo": 17500174070869287784
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.131.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.131.json
index f1104e01..24ffcd70 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.131.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.131.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6375064551591512999,
-                    "lo": 3878993651025668709
+                    "hi": 3018736719546403965,
+                    "lo": 18086123891812311967
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6375064551591512999,
-                    "lo": 3878993651025668709
+                    "hi": 3018736719546403965,
+                    "lo": 18086123891812311967
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 6375064551591512999,
-                        "lo": 3878993651025668709
+                        "hi": 3018736719546403965,
+                        "lo": 18086123891812311967
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6375064551591512999,
-                            "lo": 3878993651025668709
+                            "hi": 3018736719546403965,
+                            "lo": 18086123891812311967
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6375064551591512999,
-                                  "lo": 3878993651025668709
+                                  "hi": 3018736719546403965,
+                                  "lo": 18086123891812311967
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6375064551591512999,
-                                  "lo": 3878993651025668709
+                                  "hi": 3018736719546403965,
+                                  "lo": 18086123891812311967
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6375064551591512999,
-                            "lo": 3878993651025668709
+                            "hi": 3018736719546403965,
+                            "lo": 18086123891812311967
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6375064551591512999,
-                            "lo": 3878993651025668709
+                            "hi": 3018736719546403965,
+                            "lo": 18086123891812311967
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 3018736719546403965,
+                            "lo": 18086123891812311967
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 6375064551591512999,
-                          "lo": 3878993651025668709
+                          "hi": 3018736719546403965,
+                          "lo": 18086123891812311967
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.132.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.132.json
index b4373b07..584759b6 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.132.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.132.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3708956233438808814,
-                    "lo": 16516171825518238613
+                    "hi": 2001534114928955261,
+                    "lo": 617582294584737944
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3708956233438808814,
-                    "lo": 16516171825518238613
+                    "hi": 2001534114928955261,
+                    "lo": 617582294584737944
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 3708956233438808814,
-                        "lo": 16516171825518238613
+                        "hi": 2001534114928955261,
+                        "lo": 617582294584737944
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3708956233438808814,
-                            "lo": 16516171825518238613
+                            "hi": 2001534114928955261,
+                            "lo": 617582294584737944
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3708956233438808814,
-                                  "lo": 16516171825518238613
+                                  "hi": 2001534114928955261,
+                                  "lo": 617582294584737944
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3708956233438808814,
-                                  "lo": 16516171825518238613
+                                  "hi": 2001534114928955261,
+                                  "lo": 617582294584737944
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3708956233438808814,
-                            "lo": 16516171825518238613
+                            "hi": 2001534114928955261,
+                            "lo": 617582294584737944
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3708956233438808814,
-                            "lo": 16516171825518238613
+                            "hi": 2001534114928955261,
+                            "lo": 617582294584737944
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 2001534114928955261,
+                            "lo": 617582294584737944
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 3708956233438808814,
-                          "lo": 16516171825518238613
+                          "hi": 2001534114928955261,
+                          "lo": 617582294584737944
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.133.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.133.json
index bb2b17fd..84ad8dd3 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.133.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.133.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8384060198502847597,
-                    "lo": 14775836726557997608
+                    "hi": 908178990062925263,
+                    "lo": 13743477700500781705
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8384060198502847597,
-                    "lo": 14775836726557997608
+                    "hi": 908178990062925263,
+                    "lo": 13743477700500781705
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 8384060198502847597,
-                        "lo": 14775836726557997608
+                        "hi": 908178990062925263,
+                        "lo": 13743477700500781705
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8384060198502847597,
-                            "lo": 14775836726557997608
+                            "hi": 908178990062925263,
+                            "lo": 13743477700500781705
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8384060198502847597,
-                                  "lo": 14775836726557997608
+                                  "hi": 908178990062925263,
+                                  "lo": 13743477700500781705
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8384060198502847597,
-                                  "lo": 14775836726557997608
+                                  "hi": 908178990062925263,
+                                  "lo": 13743477700500781705
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8384060198502847597,
-                            "lo": 14775836726557997608
+                            "hi": 908178990062925263,
+                            "lo": 13743477700500781705
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8384060198502847597,
-                            "lo": 14775836726557997608
+                            "hi": 908178990062925263,
+                            "lo": 13743477700500781705
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 908178990062925263,
+                            "lo": 13743477700500781705
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 8384060198502847597,
-                          "lo": 14775836726557997608
+                          "hi": 908178990062925263,
+                          "lo": 13743477700500781705
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.134.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.134.json
index 123cff12..0ab4f317 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.134.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.134.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2666218346939810558,
-                    "lo": 16636672409899925627
+                    "hi": 3906863744953059247,
+                    "lo": 949672856609793242
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2666218346939810558,
-                    "lo": 16636672409899925627
+                    "hi": 3906863744953059247,
+                    "lo": 949672856609793242
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 2666218346939810558,
-                        "lo": 16636672409899925627
+                        "hi": 3906863744953059247,
+                        "lo": 949672856609793242
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2666218346939810558,
-                            "lo": 16636672409899925627
+                            "hi": 3906863744953059247,
+                            "lo": 949672856609793242
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2666218346939810558,
-                                  "lo": 16636672409899925627
+                                  "hi": 3906863744953059247,
+                                  "lo": 949672856609793242
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2666218346939810558,
-                                  "lo": 16636672409899925627
+                                  "hi": 3906863744953059247,
+                                  "lo": 949672856609793242
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2666218346939810558,
-                            "lo": 16636672409899925627
+                            "hi": 3906863744953059247,
+                            "lo": 949672856609793242
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2666218346939810558,
-                            "lo": 16636672409899925627
+                            "hi": 3906863744953059247,
+                            "lo": 949672856609793242
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 3906863744953059247,
+                            "lo": 949672856609793242
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 2666218346939810558,
-                          "lo": 16636672409899925627
+                          "hi": 3906863744953059247,
+                          "lo": 949672856609793242
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.135.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.135.json
index 0e310f94..4b2f582c 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.135.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.135.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 404064544648234784,
-                    "lo": 2022969608415691222
+                    "hi": 8156503388904583182,
+                    "lo": 7462492145903593147
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 404064544648234784,
-                    "lo": 2022969608415691222
+                    "hi": 8156503388904583182,
+                    "lo": 7462492145903593147
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 404064544648234784,
-                        "lo": 2022969608415691222
+                        "hi": 8156503388904583182,
+                        "lo": 7462492145903593147
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 404064544648234784,
-                            "lo": 2022969608415691222
+                            "hi": 8156503388904583182,
+                            "lo": 7462492145903593147
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 404064544648234784,
-                                  "lo": 2022969608415691222
+                                  "hi": 8156503388904583182,
+                                  "lo": 7462492145903593147
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 404064544648234784,
-                                  "lo": 2022969608415691222
+                                  "hi": 8156503388904583182,
+                                  "lo": 7462492145903593147
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 404064544648234784,
-                            "lo": 2022969608415691222
+                            "hi": 8156503388904583182,
+                            "lo": 7462492145903593147
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 404064544648234784,
-                            "lo": 2022969608415691222
+                            "hi": 8156503388904583182,
+                            "lo": 7462492145903593147
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 8156503388904583182,
+                            "lo": 7462492145903593147
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 404064544648234784,
-                          "lo": 2022969608415691222
+                          "hi": 8156503388904583182,
+                          "lo": 7462492145903593147
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.136.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.136.json
index 67269cc4..df7a9085 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.136.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.136.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7191047009952445893,
-                    "lo": 11946789985131867455
+                    "hi": 4799702707781809382,
+                    "lo": 14159525225676634827
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7191047009952445893,
-                    "lo": 11946789985131867455
+                    "hi": 4799702707781809382,
+                    "lo": 14159525225676634827
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 7191047009952445893,
-                        "lo": 11946789985131867455
+                        "hi": 4799702707781809382,
+                        "lo": 14159525225676634827
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7191047009952445893,
-                            "lo": 11946789985131867455
+                            "hi": 4799702707781809382,
+                            "lo": 14159525225676634827
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7191047009952445893,
-                                  "lo": 11946789985131867455
+                                  "hi": 4799702707781809382,
+                                  "lo": 14159525225676634827
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7191047009952445893,
-                                  "lo": 11946789985131867455
+                                  "hi": 4799702707781809382,
+                                  "lo": 14159525225676634827
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7191047009952445893,
-                            "lo": 11946789985131867455
+                            "hi": 4799702707781809382,
+                            "lo": 14159525225676634827
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7191047009952445893,
-                            "lo": 11946789985131867455
+                            "hi": 4799702707781809382,
+                            "lo": 14159525225676634827
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 4799702707781809382,
+                            "lo": 14159525225676634827
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 7191047009952445893,
-                          "lo": 11946789985131867455
+                          "hi": 4799702707781809382,
+                          "lo": 14159525225676634827
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.137.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.137.json
index dfe9a4c6..25a0cc33 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.137.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.137.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4019895420184394863,
-                    "lo": 1027500823756816802
+                    "hi": 9086986172454917261,
+                    "lo": 7389797599087916637
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4019895420184394863,
-                    "lo": 1027500823756816802
+                    "hi": 9086986172454917261,
+                    "lo": 7389797599087916637
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4019895420184394863,
-                        "lo": 1027500823756816802
+                        "hi": 9086986172454917261,
+                        "lo": 7389797599087916637
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4019895420184394863,
-                            "lo": 1027500823756816802
+                            "hi": 9086986172454917261,
+                            "lo": 7389797599087916637
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4019895420184394863,
-                                  "lo": 1027500823756816802
+                                  "hi": 9086986172454917261,
+                                  "lo": 7389797599087916637
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4019895420184394863,
-                                  "lo": 1027500823756816802
+                                  "hi": 9086986172454917261,
+                                  "lo": 7389797599087916637
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4019895420184394863,
-                            "lo": 1027500823756816802
+                            "hi": 9086986172454917261,
+                            "lo": 7389797599087916637
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4019895420184394863,
-                            "lo": 1027500823756816802
+                            "hi": 9086986172454917261,
+                            "lo": 7389797599087916637
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 9086986172454917261,
+                            "lo": 7389797599087916637
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4019895420184394863,
-                          "lo": 1027500823756816802
+                          "hi": 9086986172454917261,
+                          "lo": 7389797599087916637
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.138.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.138.json
index 7942ef40..fada84d9 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.138.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.138.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8260686916865165849,
-                    "lo": 13263137580861978416
+                    "hi": 3883064624285814559,
+                    "lo": 7897788247145786950
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8260686916865165849,
-                    "lo": 13263137580861978416
+                    "hi": 3883064624285814559,
+                    "lo": 7897788247145786950
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 8260686916865165849,
-                        "lo": 13263137580861978416
+                        "hi": 3883064624285814559,
+                        "lo": 7897788247145786950
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8260686916865165849,
-                            "lo": 13263137580861978416
+                            "hi": 3883064624285814559,
+                            "lo": 7897788247145786950
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8260686916865165849,
-                                  "lo": 13263137580861978416
+                                  "hi": 3883064624285814559,
+                                  "lo": 7897788247145786950
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8260686916865165849,
-                                  "lo": 13263137580861978416
+                                  "hi": 3883064624285814559,
+                                  "lo": 7897788247145786950
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8260686916865165849,
-                            "lo": 13263137580861978416
+                            "hi": 3883064624285814559,
+                            "lo": 7897788247145786950
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8260686916865165849,
-                            "lo": 13263137580861978416
+                            "hi": 3883064624285814559,
+                            "lo": 7897788247145786950
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 3883064624285814559,
+                            "lo": 7897788247145786950
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 8260686916865165849,
-                          "lo": 13263137580861978416
+                          "hi": 3883064624285814559,
+                          "lo": 7897788247145786950
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.139.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.139.json
index a42ea680..f34b6526 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.139.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.139.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8298989845829651599,
-                    "lo": 6762374954599575255
+                    "hi": 5774217710027833613,
+                    "lo": 1829839263602600359
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8298989845829651599,
-                    "lo": 6762374954599575255
+                    "hi": 5774217710027833613,
+                    "lo": 1829839263602600359
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 8298989845829651599,
-                        "lo": 6762374954599575255
+                        "hi": 5774217710027833613,
+                        "lo": 1829839263602600359
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8298989845829651599,
-                            "lo": 6762374954599575255
+                            "hi": 5774217710027833613,
+                            "lo": 1829839263602600359
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8298989845829651599,
-                                  "lo": 6762374954599575255
+                                  "hi": 5774217710027833613,
+                                  "lo": 1829839263602600359
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8298989845829651599,
-                                  "lo": 6762374954599575255
+                                  "hi": 5774217710027833613,
+                                  "lo": 1829839263602600359
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8298989845829651599,
-                            "lo": 6762374954599575255
+                            "hi": 5774217710027833613,
+                            "lo": 1829839263602600359
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8298989845829651599,
-                            "lo": 6762374954599575255
+                            "hi": 5774217710027833613,
+                            "lo": 1829839263602600359
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 5774217710027833613,
+                            "lo": 1829839263602600359
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 8298989845829651599,
-                          "lo": 6762374954599575255
+                          "hi": 5774217710027833613,
+                          "lo": 1829839263602600359
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.14.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.14.json
index fadd12a5..235761ed 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.14.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.14.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4026746033401452724,
-                    "lo": 10906251300010706832
+                    "hi": 5698112604610737865,
+                    "lo": 12776910221233407573
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4026746033401452724,
-                    "lo": 10906251300010706832
+                    "hi": 5698112604610737865,
+                    "lo": 12776910221233407573
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4026746033401452724,
-                        "lo": 10906251300010706832
+                        "hi": 5698112604610737865,
+                        "lo": 12776910221233407573
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4026746033401452724,
-                            "lo": 10906251300010706832
+                            "hi": 5698112604610737865,
+                            "lo": 12776910221233407573
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4026746033401452724,
-                                  "lo": 10906251300010706832
+                                  "hi": 5698112604610737865,
+                                  "lo": 12776910221233407573
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4026746033401452724,
-                                  "lo": 10906251300010706832
+                                  "hi": 5698112604610737865,
+                                  "lo": 12776910221233407573
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4026746033401452724,
-                            "lo": 10906251300010706832
+                            "hi": 5698112604610737865,
+                            "lo": 12776910221233407573
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4026746033401452724,
-                            "lo": 10906251300010706832
+                            "hi": 5698112604610737865,
+                            "lo": 12776910221233407573
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 5698112604610737865,
+                            "lo": 12776910221233407573
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4026746033401452724,
-                          "lo": 10906251300010706832
+                          "hi": 5698112604610737865,
+                          "lo": 12776910221233407573
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.140.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.140.json
index 328d5d70..51e871c2 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.140.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.140.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5985630347948091310,
-                    "lo": 17861790378683852305
+                    "hi": 6181989165308108913,
+                    "lo": 6819004307316071296
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5985630347948091310,
-                    "lo": 17861790378683852305
+                    "hi": 6181989165308108913,
+                    "lo": 6819004307316071296
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 5985630347948091310,
-                        "lo": 17861790378683852305
+                        "hi": 6181989165308108913,
+                        "lo": 6819004307316071296
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5985630347948091310,
-                            "lo": 17861790378683852305
+                            "hi": 6181989165308108913,
+                            "lo": 6819004307316071296
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5985630347948091310,
-                                  "lo": 17861790378683852305
+                                  "hi": 6181989165308108913,
+                                  "lo": 6819004307316071296
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5985630347948091310,
-                                  "lo": 17861790378683852305
+                                  "hi": 6181989165308108913,
+                                  "lo": 6819004307316071296
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5985630347948091310,
-                            "lo": 17861790378683852305
+                            "hi": 6181989165308108913,
+                            "lo": 6819004307316071296
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5985630347948091310,
-                            "lo": 17861790378683852305
+                            "hi": 6181989165308108913,
+                            "lo": 6819004307316071296
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 6181989165308108913,
+                            "lo": 6819004307316071296
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 5985630347948091310,
-                          "lo": 17861790378683852305
+                          "hi": 6181989165308108913,
+                          "lo": 6819004307316071296
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.141.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.141.json
index 01eb1ba0..f1a68c84 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.141.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.141.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2364706883586744554,
-                    "lo": 6299082143652552895
+                    "hi": 7614973825054918426,
+                    "lo": 590487607002872928
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2364706883586744554,
-                    "lo": 6299082143652552895
+                    "hi": 7614973825054918426,
+                    "lo": 590487607002872928
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 2364706883586744554,
-                        "lo": 6299082143652552895
+                        "hi": 7614973825054918426,
+                        "lo": 590487607002872928
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2364706883586744554,
-                            "lo": 6299082143652552895
+                            "hi": 7614973825054918426,
+                            "lo": 590487607002872928
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2364706883586744554,
-                                  "lo": 6299082143652552895
+                                  "hi": 7614973825054918426,
+                                  "lo": 590487607002872928
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2364706883586744554,
-                                  "lo": 6299082143652552895
+                                  "hi": 7614973825054918426,
+                                  "lo": 590487607002872928
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2364706883586744554,
-                            "lo": 6299082143652552895
+                            "hi": 7614973825054918426,
+                            "lo": 590487607002872928
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2364706883586744554,
-                            "lo": 6299082143652552895
+                            "hi": 7614973825054918426,
+                            "lo": 590487607002872928
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 7614973825054918426,
+                            "lo": 590487607002872928
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 2364706883586744554,
-                          "lo": 6299082143652552895
+                          "hi": 7614973825054918426,
+                          "lo": 590487607002872928
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.142.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.142.json
index 1a552035..d56d4461 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.142.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.142.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 231567050016995447,
-                    "lo": 6972955545170925148
+                    "hi": 8873190867166241791,
+                    "lo": 10390842190961530155
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 231567050016995447,
-                    "lo": 6972955545170925148
+                    "hi": 8873190867166241791,
+                    "lo": 10390842190961530155
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 231567050016995447,
-                        "lo": 6972955545170925148
+                        "hi": 8873190867166241791,
+                        "lo": 10390842190961530155
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 231567050016995447,
-                            "lo": 6972955545170925148
+                            "hi": 8873190867166241791,
+                            "lo": 10390842190961530155
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 231567050016995447,
-                                  "lo": 6972955545170925148
+                                  "hi": 8873190867166241791,
+                                  "lo": 10390842190961530155
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 231567050016995447,
-                                  "lo": 6972955545170925148
+                                  "hi": 8873190867166241791,
+                                  "lo": 10390842190961530155
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 231567050016995447,
-                            "lo": 6972955545170925148
+                            "hi": 8873190867166241791,
+                            "lo": 10390842190961530155
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 231567050016995447,
-                            "lo": 6972955545170925148
+                            "hi": 8873190867166241791,
+                            "lo": 10390842190961530155
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 8873190867166241791,
+                            "lo": 10390842190961530155
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 231567050016995447,
-                          "lo": 6972955545170925148
+                          "hi": 8873190867166241791,
+                          "lo": 10390842190961530155
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.143.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.143.json
index ccc045d0..1da3e83d 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.143.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.143.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4314296845423474572,
-                    "lo": 9370688662782745844
+                    "hi": 7249271387557525098,
+                    "lo": 10587515281096461187
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4314296845423474572,
-                    "lo": 9370688662782745844
+                    "hi": 7249271387557525098,
+                    "lo": 10587515281096461187
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4314296845423474572,
-                        "lo": 9370688662782745844
+                        "hi": 7249271387557525098,
+                        "lo": 10587515281096461187
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4314296845423474572,
-                            "lo": 9370688662782745844
+                            "hi": 7249271387557525098,
+                            "lo": 10587515281096461187
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4314296845423474572,
-                                  "lo": 9370688662782745844
+                                  "hi": 7249271387557525098,
+                                  "lo": 10587515281096461187
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4314296845423474572,
-                                  "lo": 9370688662782745844
+                                  "hi": 7249271387557525098,
+                                  "lo": 10587515281096461187
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4314296845423474572,
-                            "lo": 9370688662782745844
+                            "hi": 7249271387557525098,
+                            "lo": 10587515281096461187
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4314296845423474572,
-                            "lo": 9370688662782745844
+                            "hi": 7249271387557525098,
+                            "lo": 10587515281096461187
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 7249271387557525098,
+                            "lo": 10587515281096461187
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4314296845423474572,
-                          "lo": 9370688662782745844
+                          "hi": 7249271387557525098,
+                          "lo": 10587515281096461187
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.144.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.144.json
index 323f4731..2074ca2e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.144.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.144.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3366672163004968765,
-                    "lo": 18276127913209717992
+                    "hi": 4630477635449606498,
+                    "lo": 7058401195613852774
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3366672163004968765,
-                    "lo": 18276127913209717992
+                    "hi": 4630477635449606498,
+                    "lo": 7058401195613852774
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 3366672163004968765,
-                        "lo": 18276127913209717992
+                        "hi": 4630477635449606498,
+                        "lo": 7058401195613852774
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3366672163004968765,
-                            "lo": 18276127913209717992
+                            "hi": 4630477635449606498,
+                            "lo": 7058401195613852774
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3366672163004968765,
-                                  "lo": 18276127913209717992
+                                  "hi": 4630477635449606498,
+                                  "lo": 7058401195613852774
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3366672163004968765,
-                                  "lo": 18276127913209717992
+                                  "hi": 4630477635449606498,
+                                  "lo": 7058401195613852774
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3366672163004968765,
-                            "lo": 18276127913209717992
+                            "hi": 4630477635449606498,
+                            "lo": 7058401195613852774
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3366672163004968765,
-                            "lo": 18276127913209717992
+                            "hi": 4630477635449606498,
+                            "lo": 7058401195613852774
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 4630477635449606498,
+                            "lo": 7058401195613852774
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 3366672163004968765,
-                          "lo": 18276127913209717992
+                          "hi": 4630477635449606498,
+                          "lo": 7058401195613852774
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.145.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.145.json
index 1edf1a93..2dcf80e5 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.145.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.145.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6138964076201368375,
-                    "lo": 4385716122077222001
+                    "hi": 1446101006710856958,
+                    "lo": 9594034245745749497
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6138964076201368375,
-                    "lo": 4385716122077222001
+                    "hi": 1446101006710856958,
+                    "lo": 9594034245745749497
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 6138964076201368375,
-                        "lo": 4385716122077222001
+                        "hi": 1446101006710856958,
+                        "lo": 9594034245745749497
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6138964076201368375,
-                            "lo": 4385716122077222001
+                            "hi": 1446101006710856958,
+                            "lo": 9594034245745749497
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6138964076201368375,
-                                  "lo": 4385716122077222001
+                                  "hi": 1446101006710856958,
+                                  "lo": 9594034245745749497
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6138964076201368375,
-                                  "lo": 4385716122077222001
+                                  "hi": 1446101006710856958,
+                                  "lo": 9594034245745749497
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6138964076201368375,
-                            "lo": 4385716122077222001
+                            "hi": 1446101006710856958,
+                            "lo": 9594034245745749497
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6138964076201368375,
-                            "lo": 4385716122077222001
+                            "hi": 1446101006710856958,
+                            "lo": 9594034245745749497
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 1446101006710856958,
+                            "lo": 9594034245745749497
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 6138964076201368375,
-                          "lo": 4385716122077222001
+                          "hi": 1446101006710856958,
+                          "lo": 9594034245745749497
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.146.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.146.json
index 94692011..26325228 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.146.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.146.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1477703870647986006,
-                    "lo": 17289767860698037281
+                    "hi": 2245404286605412017,
+                    "lo": 6840247676204362234
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1477703870647986006,
-                    "lo": 17289767860698037281
+                    "hi": 2245404286605412017,
+                    "lo": 6840247676204362234
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 1477703870647986006,
-                        "lo": 17289767860698037281
+                        "hi": 2245404286605412017,
+                        "lo": 6840247676204362234
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1477703870647986006,
-                            "lo": 17289767860698037281
+                            "hi": 2245404286605412017,
+                            "lo": 6840247676204362234
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 1477703870647986006,
-                                  "lo": 17289767860698037281
+                                  "hi": 2245404286605412017,
+                                  "lo": 6840247676204362234
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 1477703870647986006,
-                                  "lo": 17289767860698037281
+                                  "hi": 2245404286605412017,
+                                  "lo": 6840247676204362234
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1477703870647986006,
-                            "lo": 17289767860698037281
+                            "hi": 2245404286605412017,
+                            "lo": 6840247676204362234
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1477703870647986006,
-                            "lo": 17289767860698037281
+                            "hi": 2245404286605412017,
+                            "lo": 6840247676204362234
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 2245404286605412017,
+                            "lo": 6840247676204362234
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 1477703870647986006,
-                          "lo": 17289767860698037281
+                          "hi": 2245404286605412017,
+                          "lo": 6840247676204362234
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.147.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.147.json
index 4dfe18bf..bd8e87ec 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.147.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.147.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5410857426924953826,
-                    "lo": 8724367844658538045
+                    "hi": 4459128313457510085,
+                    "lo": 11356304635698939969
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5410857426924953826,
-                    "lo": 8724367844658538045
+                    "hi": 4459128313457510085,
+                    "lo": 11356304635698939969
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 5410857426924953826,
-                        "lo": 8724367844658538045
+                        "hi": 4459128313457510085,
+                        "lo": 11356304635698939969
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5410857426924953826,
-                            "lo": 8724367844658538045
+                            "hi": 4459128313457510085,
+                            "lo": 11356304635698939969
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5410857426924953826,
-                                  "lo": 8724367844658538045
+                                  "hi": 4459128313457510085,
+                                  "lo": 11356304635698939969
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5410857426924953826,
-                                  "lo": 8724367844658538045
+                                  "hi": 4459128313457510085,
+                                  "lo": 11356304635698939969
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5410857426924953826,
-                            "lo": 8724367844658538045
+                            "hi": 4459128313457510085,
+                            "lo": 11356304635698939969
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5410857426924953826,
-                            "lo": 8724367844658538045
+                            "hi": 4459128313457510085,
+                            "lo": 11356304635698939969
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 4459128313457510085,
+                            "lo": 11356304635698939969
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 5410857426924953826,
-                          "lo": 8724367844658538045
+                          "hi": 4459128313457510085,
+                          "lo": 11356304635698939969
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.148.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.148.json
index 166f9e83..8d40b4f7 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.148.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.148.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3586997817794902791,
-                    "lo": 7192055085155075134
+                    "hi": 181940154782115619,
+                    "lo": 12432507209940361912
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3586997817794902791,
-                    "lo": 7192055085155075134
+                    "hi": 181940154782115619,
+                    "lo": 12432507209940361912
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 3586997817794902791,
-                        "lo": 7192055085155075134
+                        "hi": 181940154782115619,
+                        "lo": 12432507209940361912
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3586997817794902791,
-                            "lo": 7192055085155075134
+                            "hi": 181940154782115619,
+                            "lo": 12432507209940361912
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3586997817794902791,
-                                  "lo": 7192055085155075134
+                                  "hi": 181940154782115619,
+                                  "lo": 12432507209940361912
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3586997817794902791,
-                                  "lo": 7192055085155075134
+                                  "hi": 181940154782115619,
+                                  "lo": 12432507209940361912
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3586997817794902791,
-                            "lo": 7192055085155075134
+                            "hi": 181940154782115619,
+                            "lo": 12432507209940361912
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3586997817794902791,
-                            "lo": 7192055085155075134
+                            "hi": 181940154782115619,
+                            "lo": 12432507209940361912
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 181940154782115619,
+                            "lo": 12432507209940361912
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 3586997817794902791,
-                          "lo": 7192055085155075134
+                          "hi": 181940154782115619,
+                          "lo": 12432507209940361912
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.149.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.149.json
index 7463268b..42636e32 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.149.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.149.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3298482391148956229,
-                    "lo": 13070907205904553490
+                    "hi": 6679358953807190081,
+                    "lo": 7266916453478552293
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3298482391148956229,
-                    "lo": 13070907205904553490
+                    "hi": 6679358953807190081,
+                    "lo": 7266916453478552293
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 3298482391148956229,
-                        "lo": 13070907205904553490
+                        "hi": 6679358953807190081,
+                        "lo": 7266916453478552293
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3298482391148956229,
-                            "lo": 13070907205904553490
+                            "hi": 6679358953807190081,
+                            "lo": 7266916453478552293
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3298482391148956229,
-                                  "lo": 13070907205904553490
+                                  "hi": 6679358953807190081,
+                                  "lo": 7266916453478552293
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3298482391148956229,
-                                  "lo": 13070907205904553490
+                                  "hi": 6679358953807190081,
+                                  "lo": 7266916453478552293
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3298482391148956229,
-                            "lo": 13070907205904553490
+                            "hi": 6679358953807190081,
+                            "lo": 7266916453478552293
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3298482391148956229,
-                            "lo": 13070907205904553490
+                            "hi": 6679358953807190081,
+                            "lo": 7266916453478552293
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 6679358953807190081,
+                            "lo": 7266916453478552293
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 3298482391148956229,
-                          "lo": 13070907205904553490
+                          "hi": 6679358953807190081,
+                          "lo": 7266916453478552293
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.15.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.15.json
index 0ed7e3ef..4b432c81 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.15.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.15.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6466640632934939149,
-                    "lo": 17983720078239221341
+                    "hi": 2284769696775208580,
+                    "lo": 12833316737390806386
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6466640632934939149,
-                    "lo": 17983720078239221341
+                    "hi": 2284769696775208580,
+                    "lo": 12833316737390806386
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 6466640632934939149,
-                        "lo": 17983720078239221341
+                        "hi": 2284769696775208580,
+                        "lo": 12833316737390806386
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6466640632934939149,
-                            "lo": 17983720078239221341
+                            "hi": 2284769696775208580,
+                            "lo": 12833316737390806386
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6466640632934939149,
-                                  "lo": 17983720078239221341
+                                  "hi": 2284769696775208580,
+                                  "lo": 12833316737390806386
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6466640632934939149,
-                                  "lo": 17983720078239221341
+                                  "hi": 2284769696775208580,
+                                  "lo": 12833316737390806386
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6466640632934939149,
-                            "lo": 17983720078239221341
+                            "hi": 2284769696775208580,
+                            "lo": 12833316737390806386
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6466640632934939149,
-                            "lo": 17983720078239221341
+                            "hi": 2284769696775208580,
+                            "lo": 12833316737390806386
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 2284769696775208580,
+                            "lo": 12833316737390806386
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 6466640632934939149,
-                          "lo": 17983720078239221341
+                          "hi": 2284769696775208580,
+                          "lo": 12833316737390806386
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.150.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.150.json
index 44e9ebc6..fb0f431f 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.150.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.150.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2568869733517092039,
-                    "lo": 5725234492648046111
+                    "hi": 2307489106892238492,
+                    "lo": 2817976717632960885
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2568869733517092039,
-                    "lo": 5725234492648046111
+                    "hi": 2307489106892238492,
+                    "lo": 2817976717632960885
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 2568869733517092039,
-                        "lo": 5725234492648046111
+                        "hi": 2307489106892238492,
+                        "lo": 2817976717632960885
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2568869733517092039,
-                            "lo": 5725234492648046111
+                            "hi": 2307489106892238492,
+                            "lo": 2817976717632960885
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2568869733517092039,
-                                  "lo": 5725234492648046111
+                                  "hi": 2307489106892238492,
+                                  "lo": 2817976717632960885
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2568869733517092039,
-                                  "lo": 5725234492648046111
+                                  "hi": 2307489106892238492,
+                                  "lo": 2817976717632960885
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2568869733517092039,
-                            "lo": 5725234492648046111
+                            "hi": 2307489106892238492,
+                            "lo": 2817976717632960885
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2568869733517092039,
-                            "lo": 5725234492648046111
+                            "hi": 2307489106892238492,
+                            "lo": 2817976717632960885
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 2307489106892238492,
+                            "lo": 2817976717632960885
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 2568869733517092039,
-                          "lo": 5725234492648046111
+                          "hi": 2307489106892238492,
+                          "lo": 2817976717632960885
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.151.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.151.json
index c05bf2ab..3e154863 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.151.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.151.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7927213764240767321,
-                    "lo": 9134244785852162014
+                    "hi": 1580956250836575758,
+                    "lo": 11994940223329190261
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7927213764240767321,
-                    "lo": 9134244785852162014
+                    "hi": 1580956250836575758,
+                    "lo": 11994940223329190261
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 7927213764240767321,
-                        "lo": 9134244785852162014
+                        "hi": 1580956250836575758,
+                        "lo": 11994940223329190261
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7927213764240767321,
-                            "lo": 9134244785852162014
+                            "hi": 1580956250836575758,
+                            "lo": 11994940223329190261
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7927213764240767321,
-                                  "lo": 9134244785852162014
+                                  "hi": 1580956250836575758,
+                                  "lo": 11994940223329190261
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7927213764240767321,
-                                  "lo": 9134244785852162014
+                                  "hi": 1580956250836575758,
+                                  "lo": 11994940223329190261
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7927213764240767321,
-                            "lo": 9134244785852162014
+                            "hi": 1580956250836575758,
+                            "lo": 11994940223329190261
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7927213764240767321,
-                            "lo": 9134244785852162014
+                            "hi": 1580956250836575758,
+                            "lo": 11994940223329190261
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 1580956250836575758,
+                            "lo": 11994940223329190261
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 7927213764240767321,
-                          "lo": 9134244785852162014
+                          "hi": 1580956250836575758,
+                          "lo": 11994940223329190261
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.152.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.152.json
index 22289c16..063e8865 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.152.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.152.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5893305046934055275,
-                    "lo": 8767413076180142407
+                    "hi": 6070814118040294751,
+                    "lo": 8292505028667233439
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5893305046934055275,
-                    "lo": 8767413076180142407
+                    "hi": 6070814118040294751,
+                    "lo": 8292505028667233439
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 5893305046934055275,
-                        "lo": 8767413076180142407
+                        "hi": 6070814118040294751,
+                        "lo": 8292505028667233439
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5893305046934055275,
-                            "lo": 8767413076180142407
+                            "hi": 6070814118040294751,
+                            "lo": 8292505028667233439
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5893305046934055275,
-                                  "lo": 8767413076180142407
+                                  "hi": 6070814118040294751,
+                                  "lo": 8292505028667233439
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5893305046934055275,
-                                  "lo": 8767413076180142407
+                                  "hi": 6070814118040294751,
+                                  "lo": 8292505028667233439
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5893305046934055275,
-                            "lo": 8767413076180142407
+                            "hi": 6070814118040294751,
+                            "lo": 8292505028667233439
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5893305046934055275,
-                            "lo": 8767413076180142407
+                            "hi": 6070814118040294751,
+                            "lo": 8292505028667233439
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 6070814118040294751,
+                            "lo": 8292505028667233439
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 5893305046934055275,
-                          "lo": 8767413076180142407
+                          "hi": 6070814118040294751,
+                          "lo": 8292505028667233439
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.153.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.153.json
index 0336f1ef..02199456 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.153.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.153.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7722388543827336900,
-                    "lo": 8369992628946022514
+                    "hi": 8542655787942679328,
+                    "lo": 7754705185739574644
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7722388543827336900,
-                    "lo": 8369992628946022514
+                    "hi": 8542655787942679328,
+                    "lo": 7754705185739574644
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 7722388543827336900,
-                        "lo": 8369992628946022514
+                        "hi": 8542655787942679328,
+                        "lo": 7754705185739574644
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7722388543827336900,
-                            "lo": 8369992628946022514
+                            "hi": 8542655787942679328,
+                            "lo": 7754705185739574644
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7722388543827336900,
-                                  "lo": 8369992628946022514
+                                  "hi": 8542655787942679328,
+                                  "lo": 7754705185739574644
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7722388543827336900,
-                                  "lo": 8369992628946022514
+                                  "hi": 8542655787942679328,
+                                  "lo": 7754705185739574644
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7722388543827336900,
-                            "lo": 8369992628946022514
+                            "hi": 8542655787942679328,
+                            "lo": 7754705185739574644
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7722388543827336900,
-                            "lo": 8369992628946022514
+                            "hi": 8542655787942679328,
+                            "lo": 7754705185739574644
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 8542655787942679328,
+                            "lo": 7754705185739574644
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 7722388543827336900,
-                          "lo": 8369992628946022514
+                          "hi": 8542655787942679328,
+                          "lo": 7754705185739574644
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.154.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.154.json
index 6d6c8fc9..fd654d74 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.154.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.154.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 858733466381253292,
-                    "lo": 12261048199275286299
+                    "hi": 4629254883875295600,
+                    "lo": 4031211055497730950
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 858733466381253292,
-                    "lo": 12261048199275286299
+                    "hi": 4629254883875295600,
+                    "lo": 4031211055497730950
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 858733466381253292,
-                        "lo": 12261048199275286299
+                        "hi": 4629254883875295600,
+                        "lo": 4031211055497730950
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 858733466381253292,
-                            "lo": 12261048199275286299
+                            "hi": 4629254883875295600,
+                            "lo": 4031211055497730950
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 858733466381253292,
-                                  "lo": 12261048199275286299
+                                  "hi": 4629254883875295600,
+                                  "lo": 4031211055497730950
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 858733466381253292,
-                                  "lo": 12261048199275286299
+                                  "hi": 4629254883875295600,
+                                  "lo": 4031211055497730950
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 858733466381253292,
-                            "lo": 12261048199275286299
+                            "hi": 4629254883875295600,
+                            "lo": 4031211055497730950
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 858733466381253292,
-                            "lo": 12261048199275286299
+                            "hi": 4629254883875295600,
+                            "lo": 4031211055497730950
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 4629254883875295600,
+                            "lo": 4031211055497730950
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 858733466381253292,
-                          "lo": 12261048199275286299
+                          "hi": 4629254883875295600,
+                          "lo": 4031211055497730950
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.155.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.155.json
index a76b3e77..d34de09b 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.155.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.155.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8747281566606737124,
-                    "lo": 6565882838301920691
+                    "hi": 7153926289132407033,
+                    "lo": 13139687518964744849
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8747281566606737124,
-                    "lo": 6565882838301920691
+                    "hi": 7153926289132407033,
+                    "lo": 13139687518964744849
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 8747281566606737124,
-                        "lo": 6565882838301920691
+                        "hi": 7153926289132407033,
+                        "lo": 13139687518964744849
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8747281566606737124,
-                            "lo": 6565882838301920691
+                            "hi": 7153926289132407033,
+                            "lo": 13139687518964744849
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8747281566606737124,
-                                  "lo": 6565882838301920691
+                                  "hi": 7153926289132407033,
+                                  "lo": 13139687518964744849
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8747281566606737124,
-                                  "lo": 6565882838301920691
+                                  "hi": 7153926289132407033,
+                                  "lo": 13139687518964744849
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8747281566606737124,
-                            "lo": 6565882838301920691
+                            "hi": 7153926289132407033,
+                            "lo": 13139687518964744849
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8747281566606737124,
-                            "lo": 6565882838301920691
+                            "hi": 7153926289132407033,
+                            "lo": 13139687518964744849
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 7153926289132407033,
+                            "lo": 13139687518964744849
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 8747281566606737124,
-                          "lo": 6565882838301920691
+                          "hi": 7153926289132407033,
+                          "lo": 13139687518964744849
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.156.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.156.json
index 7bb63f9d..7e951ade 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.156.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.156.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2268364504542639565,
-                    "lo": 7157713762320914457
+                    "hi": 2791268168309326943,
+                    "lo": 5537417703378251166
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2268364504542639565,
-                    "lo": 7157713762320914457
+                    "hi": 2791268168309326943,
+                    "lo": 5537417703378251166
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 2268364504542639565,
-                        "lo": 7157713762320914457
+                        "hi": 2791268168309326943,
+                        "lo": 5537417703378251166
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2268364504542639565,
-                            "lo": 7157713762320914457
+                            "hi": 2791268168309326943,
+                            "lo": 5537417703378251166
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2268364504542639565,
-                                  "lo": 7157713762320914457
+                                  "hi": 2791268168309326943,
+                                  "lo": 5537417703378251166
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2268364504542639565,
-                                  "lo": 7157713762320914457
+                                  "hi": 2791268168309326943,
+                                  "lo": 5537417703378251166
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2268364504542639565,
-                            "lo": 7157713762320914457
+                            "hi": 2791268168309326943,
+                            "lo": 5537417703378251166
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2268364504542639565,
-                            "lo": 7157713762320914457
+                            "hi": 2791268168309326943,
+                            "lo": 5537417703378251166
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 2791268168309326943,
+                            "lo": 5537417703378251166
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 2268364504542639565,
-                          "lo": 7157713762320914457
+                          "hi": 2791268168309326943,
+                          "lo": 5537417703378251166
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.157.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.157.json
index abc55a8b..45a5eaa9 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.157.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.157.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 22075975804554387,
-                    "lo": 4028616717095252919
+                    "hi": 3327246876239454603,
+                    "lo": 10285156184780197413
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 22075975804554387,
-                    "lo": 4028616717095252919
+                    "hi": 3327246876239454603,
+                    "lo": 10285156184780197413
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 22075975804554387,
-                        "lo": 4028616717095252919
+                        "hi": 3327246876239454603,
+                        "lo": 10285156184780197413
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 22075975804554387,
-                            "lo": 4028616717095252919
+                            "hi": 3327246876239454603,
+                            "lo": 10285156184780197413
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 22075975804554387,
-                                  "lo": 4028616717095252919
+                                  "hi": 3327246876239454603,
+                                  "lo": 10285156184780197413
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 22075975804554387,
-                                  "lo": 4028616717095252919
+                                  "hi": 3327246876239454603,
+                                  "lo": 10285156184780197413
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 22075975804554387,
-                            "lo": 4028616717095252919
+                            "hi": 3327246876239454603,
+                            "lo": 10285156184780197413
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 22075975804554387,
-                            "lo": 4028616717095252919
+                            "hi": 3327246876239454603,
+                            "lo": 10285156184780197413
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 3327246876239454603,
+                            "lo": 10285156184780197413
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 22075975804554387,
-                          "lo": 4028616717095252919
+                          "hi": 3327246876239454603,
+                          "lo": 10285156184780197413
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.158.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.158.json
index b78b80f7..ff212fd0 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.158.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.158.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2040367481879049022,
-                    "lo": 18361634756002123831
+                    "hi": 1782304142133677990,
+                    "lo": 17449055372683583782
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2040367481879049022,
-                    "lo": 18361634756002123831
+                    "hi": 1782304142133677990,
+                    "lo": 17449055372683583782
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 2040367481879049022,
-                        "lo": 18361634756002123831
+                        "hi": 1782304142133677990,
+                        "lo": 17449055372683583782
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2040367481879049022,
-                            "lo": 18361634756002123831
+                            "hi": 1782304142133677990,
+                            "lo": 17449055372683583782
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2040367481879049022,
-                                  "lo": 18361634756002123831
+                                  "hi": 1782304142133677990,
+                                  "lo": 17449055372683583782
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2040367481879049022,
-                                  "lo": 18361634756002123831
+                                  "hi": 1782304142133677990,
+                                  "lo": 17449055372683583782
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2040367481879049022,
-                            "lo": 18361634756002123831
+                            "hi": 1782304142133677990,
+                            "lo": 17449055372683583782
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2040367481879049022,
-                            "lo": 18361634756002123831
+                            "hi": 1782304142133677990,
+                            "lo": 17449055372683583782
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 1782304142133677990,
+                            "lo": 17449055372683583782
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 2040367481879049022,
-                          "lo": 18361634756002123831
+                          "hi": 1782304142133677990,
+                          "lo": 17449055372683583782
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.159.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.159.json
index 90b77e6c..38f6d878 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.159.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.159.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3401301355678049098,
-                    "lo": 9867409984142378439
+                    "hi": 4677874699457048874,
+                    "lo": 9461649830642693278
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3401301355678049098,
-                    "lo": 9867409984142378439
+                    "hi": 4677874699457048874,
+                    "lo": 9461649830642693278
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 3401301355678049098,
-                        "lo": 9867409984142378439
+                        "hi": 4677874699457048874,
+                        "lo": 9461649830642693278
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3401301355678049098,
-                            "lo": 9867409984142378439
+                            "hi": 4677874699457048874,
+                            "lo": 9461649830642693278
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3401301355678049098,
-                                  "lo": 9867409984142378439
+                                  "hi": 4677874699457048874,
+                                  "lo": 9461649830642693278
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3401301355678049098,
-                                  "lo": 9867409984142378439
+                                  "hi": 4677874699457048874,
+                                  "lo": 9461649830642693278
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3401301355678049098,
-                            "lo": 9867409984142378439
+                            "hi": 4677874699457048874,
+                            "lo": 9461649830642693278
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3401301355678049098,
-                            "lo": 9867409984142378439
+                            "hi": 4677874699457048874,
+                            "lo": 9461649830642693278
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 4677874699457048874,
+                            "lo": 9461649830642693278
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 3401301355678049098,
-                          "lo": 9867409984142378439
+                          "hi": 4677874699457048874,
+                          "lo": 9461649830642693278
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.16.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.16.json
index 67188f86..80d846ee 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.16.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.16.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3818826385572903668,
-                    "lo": 25033579874348330
+                    "hi": 891349950905889677,
+                    "lo": 2843834361573978459
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3818826385572903668,
-                    "lo": 25033579874348330
+                    "hi": 891349950905889677,
+                    "lo": 2843834361573978459
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 3818826385572903668,
-                        "lo": 25033579874348330
+                        "hi": 891349950905889677,
+                        "lo": 2843834361573978459
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3818826385572903668,
-                            "lo": 25033579874348330
+                            "hi": 891349950905889677,
+                            "lo": 2843834361573978459
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3818826385572903668,
-                                  "lo": 25033579874348330
+                                  "hi": 891349950905889677,
+                                  "lo": 2843834361573978459
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3818826385572903668,
-                                  "lo": 25033579874348330
+                                  "hi": 891349950905889677,
+                                  "lo": 2843834361573978459
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3818826385572903668,
-                            "lo": 25033579874348330
+                            "hi": 891349950905889677,
+                            "lo": 2843834361573978459
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3818826385572903668,
-                            "lo": 25033579874348330
+                            "hi": 891349950905889677,
+                            "lo": 2843834361573978459
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 891349950905889677,
+                            "lo": 2843834361573978459
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 3818826385572903668,
-                          "lo": 25033579874348330
+                          "hi": 891349950905889677,
+                          "lo": 2843834361573978459
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.160.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.160.json
index f6d5da5e..d9bf9119 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.160.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.160.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 56431919837320887,
-                    "lo": 4625291642487058487
+                    "hi": 976002875289495474,
+                    "lo": 18056768491569976592
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 56431919837320887,
-                    "lo": 4625291642487058487
+                    "hi": 976002875289495474,
+                    "lo": 18056768491569976592
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 56431919837320887,
-                        "lo": 4625291642487058487
+                        "hi": 976002875289495474,
+                        "lo": 18056768491569976592
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 56431919837320887,
-                            "lo": 4625291642487058487
+                            "hi": 976002875289495474,
+                            "lo": 18056768491569976592
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 56431919837320887,
-                                  "lo": 4625291642487058487
+                                  "hi": 976002875289495474,
+                                  "lo": 18056768491569976592
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 56431919837320887,
-                                  "lo": 4625291642487058487
+                                  "hi": 976002875289495474,
+                                  "lo": 18056768491569976592
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 56431919837320887,
-                            "lo": 4625291642487058487
+                            "hi": 976002875289495474,
+                            "lo": 18056768491569976592
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 56431919837320887,
-                            "lo": 4625291642487058487
+                            "hi": 976002875289495474,
+                            "lo": 18056768491569976592
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 976002875289495474,
+                            "lo": 18056768491569976592
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 56431919837320887,
-                          "lo": 4625291642487058487
+                          "hi": 976002875289495474,
+                          "lo": 18056768491569976592
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.161.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.161.json
index e2a5796d..8ba0ba0c 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.161.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.161.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5899283993019074246,
-                    "lo": 7460912003402030399
+                    "hi": 5906943865588535168,
+                    "lo": 17014337514633768196
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5899283993019074246,
-                    "lo": 7460912003402030399
+                    "hi": 5906943865588535168,
+                    "lo": 17014337514633768196
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 5899283993019074246,
-                        "lo": 7460912003402030399
+                        "hi": 5906943865588535168,
+                        "lo": 17014337514633768196
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5899283993019074246,
-                            "lo": 7460912003402030399
+                            "hi": 5906943865588535168,
+                            "lo": 17014337514633768196
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5899283993019074246,
-                                  "lo": 7460912003402030399
+                                  "hi": 5906943865588535168,
+                                  "lo": 17014337514633768196
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5899283993019074246,
-                                  "lo": 7460912003402030399
+                                  "hi": 5906943865588535168,
+                                  "lo": 17014337514633768196
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5899283993019074246,
-                            "lo": 7460912003402030399
+                            "hi": 5906943865588535168,
+                            "lo": 17014337514633768196
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5899283993019074246,
-                            "lo": 7460912003402030399
+                            "hi": 5906943865588535168,
+                            "lo": 17014337514633768196
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 5906943865588535168,
+                            "lo": 17014337514633768196
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 5899283993019074246,
-                          "lo": 7460912003402030399
+                          "hi": 5906943865588535168,
+                          "lo": 17014337514633768196
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.162.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.162.json
index 91079db4..db5e9094 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.162.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.162.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6503610758534082200,
-                    "lo": 17570819811674749425
+                    "hi": 8180221517339782658,
+                    "lo": 1767906160338584423
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6503610758534082200,
-                    "lo": 17570819811674749425
+                    "hi": 8180221517339782658,
+                    "lo": 1767906160338584423
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 6503610758534082200,
-                        "lo": 17570819811674749425
+                        "hi": 8180221517339782658,
+                        "lo": 1767906160338584423
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6503610758534082200,
-                            "lo": 17570819811674749425
+                            "hi": 8180221517339782658,
+                            "lo": 1767906160338584423
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6503610758534082200,
-                                  "lo": 17570819811674749425
+                                  "hi": 8180221517339782658,
+                                  "lo": 1767906160338584423
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6503610758534082200,
-                                  "lo": 17570819811674749425
+                                  "hi": 8180221517339782658,
+                                  "lo": 1767906160338584423
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6503610758534082200,
-                            "lo": 17570819811674749425
+                            "hi": 8180221517339782658,
+                            "lo": 1767906160338584423
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6503610758534082200,
-                            "lo": 17570819811674749425
+                            "hi": 8180221517339782658,
+                            "lo": 1767906160338584423
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 8180221517339782658,
+                            "lo": 1767906160338584423
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 6503610758534082200,
-                          "lo": 17570819811674749425
+                          "hi": 8180221517339782658,
+                          "lo": 1767906160338584423
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.163.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.163.json
index 6ad9d31d..f2a95ac1 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.163.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.163.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5859467768652792191,
-                    "lo": 8289404292443448466
+                    "hi": 3528744889077771384,
+                    "lo": 1813974472420470861
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5859467768652792191,
-                    "lo": 8289404292443448466
+                    "hi": 3528744889077771384,
+                    "lo": 1813974472420470861
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 5859467768652792191,
-                        "lo": 8289404292443448466
+                        "hi": 3528744889077771384,
+                        "lo": 1813974472420470861
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5859467768652792191,
-                            "lo": 8289404292443448466
+                            "hi": 3528744889077771384,
+                            "lo": 1813974472420470861
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5859467768652792191,
-                                  "lo": 8289404292443448466
+                                  "hi": 3528744889077771384,
+                                  "lo": 1813974472420470861
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5859467768652792191,
-                                  "lo": 8289404292443448466
+                                  "hi": 3528744889077771384,
+                                  "lo": 1813974472420470861
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5859467768652792191,
-                            "lo": 8289404292443448466
+                            "hi": 3528744889077771384,
+                            "lo": 1813974472420470861
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5859467768652792191,
-                            "lo": 8289404292443448466
+                            "hi": 3528744889077771384,
+                            "lo": 1813974472420470861
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 3528744889077771384,
+                            "lo": 1813974472420470861
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 5859467768652792191,
-                          "lo": 8289404292443448466
+                          "hi": 3528744889077771384,
+                          "lo": 1813974472420470861
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.164.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.164.json
index 7a354c7d..ea513625 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.164.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.164.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5850877412812480571,
-                    "lo": 14923848392535311631
+                    "hi": 6042561314459441581,
+                    "lo": 13060783916483427737
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5850877412812480571,
-                    "lo": 14923848392535311631
+                    "hi": 6042561314459441581,
+                    "lo": 13060783916483427737
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 5850877412812480571,
-                        "lo": 14923848392535311631
+                        "hi": 6042561314459441581,
+                        "lo": 13060783916483427737
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5850877412812480571,
-                            "lo": 14923848392535311631
+                            "hi": 6042561314459441581,
+                            "lo": 13060783916483427737
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5850877412812480571,
-                                  "lo": 14923848392535311631
+                                  "hi": 6042561314459441581,
+                                  "lo": 13060783916483427737
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5850877412812480571,
-                                  "lo": 14923848392535311631
+                                  "hi": 6042561314459441581,
+                                  "lo": 13060783916483427737
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5850877412812480571,
-                            "lo": 14923848392535311631
+                            "hi": 6042561314459441581,
+                            "lo": 13060783916483427737
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5850877412812480571,
-                            "lo": 14923848392535311631
+                            "hi": 6042561314459441581,
+                            "lo": 13060783916483427737
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 6042561314459441581,
+                            "lo": 13060783916483427737
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 5850877412812480571,
-                          "lo": 14923848392535311631
+                          "hi": 6042561314459441581,
+                          "lo": 13060783916483427737
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.165.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.165.json
index 6ac4b04f..403b88aa 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.165.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.165.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1375197082463775897,
-                    "lo": 17355959205594956728
+                    "hi": 8031121663796172969,
+                    "lo": 15862884565020932373
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1375197082463775897,
-                    "lo": 17355959205594956728
+                    "hi": 8031121663796172969,
+                    "lo": 15862884565020932373
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 1375197082463775897,
-                        "lo": 17355959205594956728
+                        "hi": 8031121663796172969,
+                        "lo": 15862884565020932373
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1375197082463775897,
-                            "lo": 17355959205594956728
+                            "hi": 8031121663796172969,
+                            "lo": 15862884565020932373
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 1375197082463775897,
-                                  "lo": 17355959205594956728
+                                  "hi": 8031121663796172969,
+                                  "lo": 15862884565020932373
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 1375197082463775897,
-                                  "lo": 17355959205594956728
+                                  "hi": 8031121663796172969,
+                                  "lo": 15862884565020932373
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1375197082463775897,
-                            "lo": 17355959205594956728
+                            "hi": 8031121663796172969,
+                            "lo": 15862884565020932373
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1375197082463775897,
-                            "lo": 17355959205594956728
+                            "hi": 8031121663796172969,
+                            "lo": 15862884565020932373
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 8031121663796172969,
+                            "lo": 15862884565020932373
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 1375197082463775897,
-                          "lo": 17355959205594956728
+                          "hi": 8031121663796172969,
+                          "lo": 15862884565020932373
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.166.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.166.json
index e81a2f38..7bb8b435 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.166.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.166.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8485735636174047382,
-                    "lo": 17228379875857646393
+                    "hi": 5894812470028108274,
+                    "lo": 14822680565697779839
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8485735636174047382,
-                    "lo": 17228379875857646393
+                    "hi": 5894812470028108274,
+                    "lo": 14822680565697779839
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 8485735636174047382,
-                        "lo": 17228379875857646393
+                        "hi": 5894812470028108274,
+                        "lo": 14822680565697779839
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8485735636174047382,
-                            "lo": 17228379875857646393
+                            "hi": 5894812470028108274,
+                            "lo": 14822680565697779839
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8485735636174047382,
-                                  "lo": 17228379875857646393
+                                  "hi": 5894812470028108274,
+                                  "lo": 14822680565697779839
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8485735636174047382,
-                                  "lo": 17228379875857646393
+                                  "hi": 5894812470028108274,
+                                  "lo": 14822680565697779839
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8485735636174047382,
-                            "lo": 17228379875857646393
+                            "hi": 5894812470028108274,
+                            "lo": 14822680565697779839
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8485735636174047382,
-                            "lo": 17228379875857646393
+                            "hi": 5894812470028108274,
+                            "lo": 14822680565697779839
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 5894812470028108274,
+                            "lo": 14822680565697779839
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 8485735636174047382,
-                          "lo": 17228379875857646393
+                          "hi": 5894812470028108274,
+                          "lo": 14822680565697779839
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.167.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.167.json
index 163f1647..2f89a6b5 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.167.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.167.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 648541952598953421,
-                    "lo": 14989873034137304596
+                    "hi": 3278125607301095804,
+                    "lo": 5847799218373650052
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 648541952598953421,
-                    "lo": 14989873034137304596
+                    "hi": 3278125607301095804,
+                    "lo": 5847799218373650052
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 648541952598953421,
-                        "lo": 14989873034137304596
+                        "hi": 3278125607301095804,
+                        "lo": 5847799218373650052
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 648541952598953421,
-                            "lo": 14989873034137304596
+                            "hi": 3278125607301095804,
+                            "lo": 5847799218373650052
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 648541952598953421,
-                                  "lo": 14989873034137304596
+                                  "hi": 3278125607301095804,
+                                  "lo": 5847799218373650052
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 648541952598953421,
-                                  "lo": 14989873034137304596
+                                  "hi": 3278125607301095804,
+                                  "lo": 5847799218373650052
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 648541952598953421,
-                            "lo": 14989873034137304596
+                            "hi": 3278125607301095804,
+                            "lo": 5847799218373650052
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 648541952598953421,
-                            "lo": 14989873034137304596
+                            "hi": 3278125607301095804,
+                            "lo": 5847799218373650052
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 3278125607301095804,
+                            "lo": 5847799218373650052
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 648541952598953421,
-                          "lo": 14989873034137304596
+                          "hi": 3278125607301095804,
+                          "lo": 5847799218373650052
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.168.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.168.json
index b9bc24cd..6a5adc1c 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.168.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.168.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7752387644043088602,
-                    "lo": 3717933527991200567
+                    "hi": 402226993049763625,
+                    "lo": 11816495595467750003
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7752387644043088602,
-                    "lo": 3717933527991200567
+                    "hi": 402226993049763625,
+                    "lo": 11816495595467750003
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 7752387644043088602,
-                        "lo": 3717933527991200567
+                        "hi": 402226993049763625,
+                        "lo": 11816495595467750003
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7752387644043088602,
-                            "lo": 3717933527991200567
+                            "hi": 402226993049763625,
+                            "lo": 11816495595467750003
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7752387644043088602,
-                                  "lo": 3717933527991200567
+                                  "hi": 402226993049763625,
+                                  "lo": 11816495595467750003
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7752387644043088602,
-                                  "lo": 3717933527991200567
+                                  "hi": 402226993049763625,
+                                  "lo": 11816495595467750003
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7752387644043088602,
-                            "lo": 3717933527991200567
+                            "hi": 402226993049763625,
+                            "lo": 11816495595467750003
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7752387644043088602,
-                            "lo": 3717933527991200567
+                            "hi": 402226993049763625,
+                            "lo": 11816495595467750003
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 402226993049763625,
+                            "lo": 11816495595467750003
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 7752387644043088602,
-                          "lo": 3717933527991200567
+                          "hi": 402226993049763625,
+                          "lo": 11816495595467750003
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.169.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.169.json
index bcc30215..ebe741f0 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.169.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.169.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4041241865037019279,
-                    "lo": 6562358501813037240
+                    "hi": 2657204447261065727,
+                    "lo": 1723124293205607172
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4041241865037019279,
-                    "lo": 6562358501813037240
+                    "hi": 2657204447261065727,
+                    "lo": 1723124293205607172
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4041241865037019279,
-                        "lo": 6562358501813037240
+                        "hi": 2657204447261065727,
+                        "lo": 1723124293205607172
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4041241865037019279,
-                            "lo": 6562358501813037240
+                            "hi": 2657204447261065727,
+                            "lo": 1723124293205607172
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4041241865037019279,
-                                  "lo": 6562358501813037240
+                                  "hi": 2657204447261065727,
+                                  "lo": 1723124293205607172
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4041241865037019279,
-                                  "lo": 6562358501813037240
+                                  "hi": 2657204447261065727,
+                                  "lo": 1723124293205607172
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4041241865037019279,
-                            "lo": 6562358501813037240
+                            "hi": 2657204447261065727,
+                            "lo": 1723124293205607172
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4041241865037019279,
-                            "lo": 6562358501813037240
+                            "hi": 2657204447261065727,
+                            "lo": 1723124293205607172
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 2657204447261065727,
+                            "lo": 1723124293205607172
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4041241865037019279,
-                          "lo": 6562358501813037240
+                          "hi": 2657204447261065727,
+                          "lo": 1723124293205607172
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.17.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.17.json
index 90445ea8..5f3d6ba2 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.17.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.17.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5543525350503588071,
-                    "lo": 4668323513413177047
+                    "hi": 4831001601321836003,
+                    "lo": 10680887940946498796
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5543525350503588071,
-                    "lo": 4668323513413177047
+                    "hi": 4831001601321836003,
+                    "lo": 10680887940946498796
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 5543525350503588071,
-                        "lo": 4668323513413177047
+                        "hi": 4831001601321836003,
+                        "lo": 10680887940946498796
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5543525350503588071,
-                            "lo": 4668323513413177047
+                            "hi": 4831001601321836003,
+                            "lo": 10680887940946498796
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5543525350503588071,
-                                  "lo": 4668323513413177047
+                                  "hi": 4831001601321836003,
+                                  "lo": 10680887940946498796
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5543525350503588071,
-                                  "lo": 4668323513413177047
+                                  "hi": 4831001601321836003,
+                                  "lo": 10680887940946498796
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5543525350503588071,
-                            "lo": 4668323513413177047
+                            "hi": 4831001601321836003,
+                            "lo": 10680887940946498796
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5543525350503588071,
-                            "lo": 4668323513413177047
+                            "hi": 4831001601321836003,
+                            "lo": 10680887940946498796
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 4831001601321836003,
+                            "lo": 10680887940946498796
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 5543525350503588071,
-                          "lo": 4668323513413177047
+                          "hi": 4831001601321836003,
+                          "lo": 10680887940946498796
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.170.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.170.json
index 5206d28d..ec8bb387 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.170.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.170.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7511092502875136404,
-                    "lo": 10078826934557586101
+                    "hi": 4802505111002991111,
+                    "lo": 15505229180464818056
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7511092502875136404,
-                    "lo": 10078826934557586101
+                    "hi": 4802505111002991111,
+                    "lo": 15505229180464818056
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 7511092502875136404,
-                        "lo": 10078826934557586101
+                        "hi": 4802505111002991111,
+                        "lo": 15505229180464818056
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7511092502875136404,
-                            "lo": 10078826934557586101
+                            "hi": 4802505111002991111,
+                            "lo": 15505229180464818056
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7511092502875136404,
-                                  "lo": 10078826934557586101
+                                  "hi": 4802505111002991111,
+                                  "lo": 15505229180464818056
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7511092502875136404,
-                                  "lo": 10078826934557586101
+                                  "hi": 4802505111002991111,
+                                  "lo": 15505229180464818056
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7511092502875136404,
-                            "lo": 10078826934557586101
+                            "hi": 4802505111002991111,
+                            "lo": 15505229180464818056
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7511092502875136404,
-                            "lo": 10078826934557586101
+                            "hi": 4802505111002991111,
+                            "lo": 15505229180464818056
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 4802505111002991111,
+                            "lo": 15505229180464818056
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 7511092502875136404,
-                          "lo": 10078826934557586101
+                          "hi": 4802505111002991111,
+                          "lo": 15505229180464818056
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.171.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.171.json
index 7ebfbc0c..f30d462c 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.171.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.171.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3965571258081197839,
-                    "lo": 3701331703189581517
+                    "hi": 325655361691237599,
+                    "lo": 8693202577771243407
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3965571258081197839,
-                    "lo": 3701331703189581517
+                    "hi": 325655361691237599,
+                    "lo": 8693202577771243407
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 3965571258081197839,
-                        "lo": 3701331703189581517
+                        "hi": 325655361691237599,
+                        "lo": 8693202577771243407
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3965571258081197839,
-                            "lo": 3701331703189581517
+                            "hi": 325655361691237599,
+                            "lo": 8693202577771243407
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3965571258081197839,
-                                  "lo": 3701331703189581517
+                                  "hi": 325655361691237599,
+                                  "lo": 8693202577771243407
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3965571258081197839,
-                                  "lo": 3701331703189581517
+                                  "hi": 325655361691237599,
+                                  "lo": 8693202577771243407
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3965571258081197839,
-                            "lo": 3701331703189581517
+                            "hi": 325655361691237599,
+                            "lo": 8693202577771243407
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3965571258081197839,
-                            "lo": 3701331703189581517
+                            "hi": 325655361691237599,
+                            "lo": 8693202577771243407
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 325655361691237599,
+                            "lo": 8693202577771243407
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 3965571258081197839,
-                          "lo": 3701331703189581517
+                          "hi": 325655361691237599,
+                          "lo": 8693202577771243407
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.172.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.172.json
index 60d35730..2423f1c4 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.172.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.172.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4775993611883281682,
-                    "lo": 8436186227246738421
+                    "hi": 8902467970650379303,
+                    "lo": 13679474597315430265
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4775993611883281682,
-                    "lo": 8436186227246738421
+                    "hi": 8902467970650379303,
+                    "lo": 13679474597315430265
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4775993611883281682,
-                        "lo": 8436186227246738421
+                        "hi": 8902467970650379303,
+                        "lo": 13679474597315430265
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4775993611883281682,
-                            "lo": 8436186227246738421
+                            "hi": 8902467970650379303,
+                            "lo": 13679474597315430265
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4775993611883281682,
-                                  "lo": 8436186227246738421
+                                  "hi": 8902467970650379303,
+                                  "lo": 13679474597315430265
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4775993611883281682,
-                                  "lo": 8436186227246738421
+                                  "hi": 8902467970650379303,
+                                  "lo": 13679474597315430265
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4775993611883281682,
-                            "lo": 8436186227246738421
+                            "hi": 8902467970650379303,
+                            "lo": 13679474597315430265
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4775993611883281682,
-                            "lo": 8436186227246738421
+                            "hi": 8902467970650379303,
+                            "lo": 13679474597315430265
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 8902467970650379303,
+                            "lo": 13679474597315430265
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4775993611883281682,
-                          "lo": 8436186227246738421
+                          "hi": 8902467970650379303,
+                          "lo": 13679474597315430265
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.173.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.173.json
index 5f59bb4f..45c47dcc 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.173.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.173.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8460059250166969912,
-                    "lo": 14552244469010302471
+                    "hi": 2303413424296737798,
+                    "lo": 5147693268825480804
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8460059250166969912,
-                    "lo": 14552244469010302471
+                    "hi": 2303413424296737798,
+                    "lo": 5147693268825480804
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 8460059250166969912,
-                        "lo": 14552244469010302471
+                        "hi": 2303413424296737798,
+                        "lo": 5147693268825480804
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8460059250166969912,
-                            "lo": 14552244469010302471
+                            "hi": 2303413424296737798,
+                            "lo": 5147693268825480804
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8460059250166969912,
-                                  "lo": 14552244469010302471
+                                  "hi": 2303413424296737798,
+                                  "lo": 5147693268825480804
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8460059250166969912,
-                                  "lo": 14552244469010302471
+                                  "hi": 2303413424296737798,
+                                  "lo": 5147693268825480804
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8460059250166969912,
-                            "lo": 14552244469010302471
+                            "hi": 2303413424296737798,
+                            "lo": 5147693268825480804
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8460059250166969912,
-                            "lo": 14552244469010302471
+                            "hi": 2303413424296737798,
+                            "lo": 5147693268825480804
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 2303413424296737798,
+                            "lo": 5147693268825480804
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 8460059250166969912,
-                          "lo": 14552244469010302471
+                          "hi": 2303413424296737798,
+                          "lo": 5147693268825480804
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.174.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.174.json
index 9f13b145..3e9a6c85 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.174.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.174.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4526990889423860708,
-                    "lo": 15550828051346195753
+                    "hi": 2707499499275239953,
+                    "lo": 13583367565109280018
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4526990889423860708,
-                    "lo": 15550828051346195753
+                    "hi": 2707499499275239953,
+                    "lo": 13583367565109280018
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4526990889423860708,
-                        "lo": 15550828051346195753
+                        "hi": 2707499499275239953,
+                        "lo": 13583367565109280018
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4526990889423860708,
-                            "lo": 15550828051346195753
+                            "hi": 2707499499275239953,
+                            "lo": 13583367565109280018
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4526990889423860708,
-                                  "lo": 15550828051346195753
+                                  "hi": 2707499499275239953,
+                                  "lo": 13583367565109280018
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4526990889423860708,
-                                  "lo": 15550828051346195753
+                                  "hi": 2707499499275239953,
+                                  "lo": 13583367565109280018
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4526990889423860708,
-                            "lo": 15550828051346195753
+                            "hi": 2707499499275239953,
+                            "lo": 13583367565109280018
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4526990889423860708,
-                            "lo": 15550828051346195753
+                            "hi": 2707499499275239953,
+                            "lo": 13583367565109280018
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 2707499499275239953,
+                            "lo": 13583367565109280018
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4526990889423860708,
-                          "lo": 15550828051346195753
+                          "hi": 2707499499275239953,
+                          "lo": 13583367565109280018
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.175.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.175.json
index a88a8ac9..1c9158e4 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.175.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.175.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7507524974226781954,
-                    "lo": 2451561351095414096
+                    "hi": 4452954509315888619,
+                    "lo": 9337735958048141341
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7507524974226781954,
-                    "lo": 2451561351095414096
+                    "hi": 4452954509315888619,
+                    "lo": 9337735958048141341
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 7507524974226781954,
-                        "lo": 2451561351095414096
+                        "hi": 4452954509315888619,
+                        "lo": 9337735958048141341
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7507524974226781954,
-                            "lo": 2451561351095414096
+                            "hi": 4452954509315888619,
+                            "lo": 9337735958048141341
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7507524974226781954,
-                                  "lo": 2451561351095414096
+                                  "hi": 4452954509315888619,
+                                  "lo": 9337735958048141341
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7507524974226781954,
-                                  "lo": 2451561351095414096
+                                  "hi": 4452954509315888619,
+                                  "lo": 9337735958048141341
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7507524974226781954,
-                            "lo": 2451561351095414096
+                            "hi": 4452954509315888619,
+                            "lo": 9337735958048141341
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7507524974226781954,
-                            "lo": 2451561351095414096
+                            "hi": 4452954509315888619,
+                            "lo": 9337735958048141341
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 4452954509315888619,
+                            "lo": 9337735958048141341
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 7507524974226781954,
-                          "lo": 2451561351095414096
+                          "hi": 4452954509315888619,
+                          "lo": 9337735958048141341
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.176.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.176.json
index 1903fca4..61aa8f19 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.176.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.176.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5090801312646274738,
-                    "lo": 11174420470671873452
+                    "hi": 6947390641547376,
+                    "lo": 8401578539125926790
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5090801312646274738,
-                    "lo": 11174420470671873452
+                    "hi": 6947390641547376,
+                    "lo": 8401578539125926790
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 5090801312646274738,
-                        "lo": 11174420470671873452
+                        "hi": 6947390641547376,
+                        "lo": 8401578539125926790
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5090801312646274738,
-                            "lo": 11174420470671873452
+                            "hi": 6947390641547376,
+                            "lo": 8401578539125926790
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5090801312646274738,
-                                  "lo": 11174420470671873452
+                                  "hi": 6947390641547376,
+                                  "lo": 8401578539125926790
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5090801312646274738,
-                                  "lo": 11174420470671873452
+                                  "hi": 6947390641547376,
+                                  "lo": 8401578539125926790
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5090801312646274738,
-                            "lo": 11174420470671873452
+                            "hi": 6947390641547376,
+                            "lo": 8401578539125926790
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5090801312646274738,
-                            "lo": 11174420470671873452
+                            "hi": 6947390641547376,
+                            "lo": 8401578539125926790
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 6947390641547376,
+                            "lo": 8401578539125926790
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 5090801312646274738,
-                          "lo": 11174420470671873452
+                          "hi": 6947390641547376,
+                          "lo": 8401578539125926790
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.177.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.177.json
index fd0a148e..13fced10 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.177.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.177.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 885794763244648791,
-                    "lo": 7261188445361903211
+                    "hi": 7118691304474314557,
+                    "lo": 7761106663566871060
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 885794763244648791,
-                    "lo": 7261188445361903211
+                    "hi": 7118691304474314557,
+                    "lo": 7761106663566871060
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 885794763244648791,
-                        "lo": 7261188445361903211
+                        "hi": 7118691304474314557,
+                        "lo": 7761106663566871060
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 885794763244648791,
-                            "lo": 7261188445361903211
+                            "hi": 7118691304474314557,
+                            "lo": 7761106663566871060
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 885794763244648791,
-                                  "lo": 7261188445361903211
+                                  "hi": 7118691304474314557,
+                                  "lo": 7761106663566871060
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 885794763244648791,
-                                  "lo": 7261188445361903211
+                                  "hi": 7118691304474314557,
+                                  "lo": 7761106663566871060
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 885794763244648791,
-                            "lo": 7261188445361903211
+                            "hi": 7118691304474314557,
+                            "lo": 7761106663566871060
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 885794763244648791,
-                            "lo": 7261188445361903211
+                            "hi": 7118691304474314557,
+                            "lo": 7761106663566871060
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 7118691304474314557,
+                            "lo": 7761106663566871060
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 885794763244648791,
-                          "lo": 7261188445361903211
+                          "hi": 7118691304474314557,
+                          "lo": 7761106663566871060
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.178.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.178.json
index 9e87e497..876ec8ec 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.178.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.178.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2245171139118076512,
-                    "lo": 16323619256100202477
+                    "hi": 4846659644429397578,
+                    "lo": 11504546430060805288
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2245171139118076512,
-                    "lo": 16323619256100202477
+                    "hi": 4846659644429397578,
+                    "lo": 11504546430060805288
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 2245171139118076512,
-                        "lo": 16323619256100202477
+                        "hi": 4846659644429397578,
+                        "lo": 11504546430060805288
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2245171139118076512,
-                            "lo": 16323619256100202477
+                            "hi": 4846659644429397578,
+                            "lo": 11504546430060805288
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2245171139118076512,
-                                  "lo": 16323619256100202477
+                                  "hi": 4846659644429397578,
+                                  "lo": 11504546430060805288
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2245171139118076512,
-                                  "lo": 16323619256100202477
+                                  "hi": 4846659644429397578,
+                                  "lo": 11504546430060805288
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2245171139118076512,
-                            "lo": 16323619256100202477
+                            "hi": 4846659644429397578,
+                            "lo": 11504546430060805288
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2245171139118076512,
-                            "lo": 16323619256100202477
+                            "hi": 4846659644429397578,
+                            "lo": 11504546430060805288
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 4846659644429397578,
+                            "lo": 11504546430060805288
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 2245171139118076512,
-                          "lo": 16323619256100202477
+                          "hi": 4846659644429397578,
+                          "lo": 11504546430060805288
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.179.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.179.json
index 2154714e..f70d90c2 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.179.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.179.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8943148826372610568,
-                    "lo": 8158027146810943251
+                    "hi": 554335970692671018,
+                    "lo": 15436879966893911290
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8943148826372610568,
-                    "lo": 8158027146810943251
+                    "hi": 554335970692671018,
+                    "lo": 15436879966893911290
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 8943148826372610568,
-                        "lo": 8158027146810943251
+                        "hi": 554335970692671018,
+                        "lo": 15436879966893911290
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8943148826372610568,
-                            "lo": 8158027146810943251
+                            "hi": 554335970692671018,
+                            "lo": 15436879966893911290
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8943148826372610568,
-                                  "lo": 8158027146810943251
+                                  "hi": 554335970692671018,
+                                  "lo": 15436879966893911290
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8943148826372610568,
-                                  "lo": 8158027146810943251
+                                  "hi": 554335970692671018,
+                                  "lo": 15436879966893911290
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8943148826372610568,
-                            "lo": 8158027146810943251
+                            "hi": 554335970692671018,
+                            "lo": 15436879966893911290
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8943148826372610568,
-                            "lo": 8158027146810943251
+                            "hi": 554335970692671018,
+                            "lo": 15436879966893911290
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 554335970692671018,
+                            "lo": 15436879966893911290
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 8943148826372610568,
-                          "lo": 8158027146810943251
+                          "hi": 554335970692671018,
+                          "lo": 15436879966893911290
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.18.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.18.json
index d48a0e89..7fd99441 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.18.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.18.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2609411800315903330,
-                    "lo": 9604318711524062411
+                    "hi": 1893095840471799233,
+                    "lo": 17699623538586657064
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2609411800315903330,
-                    "lo": 9604318711524062411
+                    "hi": 1893095840471799233,
+                    "lo": 17699623538586657064
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 2609411800315903330,
-                        "lo": 9604318711524062411
+                        "hi": 1893095840471799233,
+                        "lo": 17699623538586657064
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2609411800315903330,
-                            "lo": 9604318711524062411
+                            "hi": 1893095840471799233,
+                            "lo": 17699623538586657064
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2609411800315903330,
-                                  "lo": 9604318711524062411
+                                  "hi": 1893095840471799233,
+                                  "lo": 17699623538586657064
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2609411800315903330,
-                                  "lo": 9604318711524062411
+                                  "hi": 1893095840471799233,
+                                  "lo": 17699623538586657064
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2609411800315903330,
-                            "lo": 9604318711524062411
+                            "hi": 1893095840471799233,
+                            "lo": 17699623538586657064
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2609411800315903330,
-                            "lo": 9604318711524062411
+                            "hi": 1893095840471799233,
+                            "lo": 17699623538586657064
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 1893095840471799233,
+                            "lo": 17699623538586657064
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 2609411800315903330,
-                          "lo": 9604318711524062411
+                          "hi": 1893095840471799233,
+                          "lo": 17699623538586657064
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.180.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.180.json
index ef111933..49375bd0 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.180.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.180.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2218987392620647297,
-                    "lo": 2960994885967054025
+                    "hi": 4966741916308213207,
+                    "lo": 2467103166963183147
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2218987392620647297,
-                    "lo": 2960994885967054025
+                    "hi": 4966741916308213207,
+                    "lo": 2467103166963183147
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 2218987392620647297,
-                        "lo": 2960994885967054025
+                        "hi": 4966741916308213207,
+                        "lo": 2467103166963183147
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2218987392620647297,
-                            "lo": 2960994885967054025
+                            "hi": 4966741916308213207,
+                            "lo": 2467103166963183147
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2218987392620647297,
-                                  "lo": 2960994885967054025
+                                  "hi": 4966741916308213207,
+                                  "lo": 2467103166963183147
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2218987392620647297,
-                                  "lo": 2960994885967054025
+                                  "hi": 4966741916308213207,
+                                  "lo": 2467103166963183147
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2218987392620647297,
-                            "lo": 2960994885967054025
+                            "hi": 4966741916308213207,
+                            "lo": 2467103166963183147
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2218987392620647297,
-                            "lo": 2960994885967054025
+                            "hi": 4966741916308213207,
+                            "lo": 2467103166963183147
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 4966741916308213207,
+                            "lo": 2467103166963183147
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 2218987392620647297,
-                          "lo": 2960994885967054025
+                          "hi": 4966741916308213207,
+                          "lo": 2467103166963183147
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.181.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.181.json
index 2e416b9b..2df34913 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.181.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.181.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5827414226337233722,
-                    "lo": 3771370868758363550
+                    "hi": 2170119179577909550,
+                    "lo": 5568769534431148713
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5827414226337233722,
-                    "lo": 3771370868758363550
+                    "hi": 2170119179577909550,
+                    "lo": 5568769534431148713
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 5827414226337233722,
-                        "lo": 3771370868758363550
+                        "hi": 2170119179577909550,
+                        "lo": 5568769534431148713
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5827414226337233722,
-                            "lo": 3771370868758363550
+                            "hi": 2170119179577909550,
+                            "lo": 5568769534431148713
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5827414226337233722,
-                                  "lo": 3771370868758363550
+                                  "hi": 2170119179577909550,
+                                  "lo": 5568769534431148713
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5827414226337233722,
-                                  "lo": 3771370868758363550
+                                  "hi": 2170119179577909550,
+                                  "lo": 5568769534431148713
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5827414226337233722,
-                            "lo": 3771370868758363550
+                            "hi": 2170119179577909550,
+                            "lo": 5568769534431148713
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5827414226337233722,
-                            "lo": 3771370868758363550
+                            "hi": 2170119179577909550,
+                            "lo": 5568769534431148713
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 2170119179577909550,
+                            "lo": 5568769534431148713
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 5827414226337233722,
-                          "lo": 3771370868758363550
+                          "hi": 2170119179577909550,
+                          "lo": 5568769534431148713
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.182.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.182.json
index 40c21d5d..dc8df4c4 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.182.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.182.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5110442397934182473,
-                    "lo": 2255862956726875978
+                    "hi": 1952381697784176686,
+                    "lo": 14313344291691588449
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5110442397934182473,
-                    "lo": 2255862956726875978
+                    "hi": 1952381697784176686,
+                    "lo": 14313344291691588449
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 5110442397934182473,
-                        "lo": 2255862956726875978
+                        "hi": 1952381697784176686,
+                        "lo": 14313344291691588449
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5110442397934182473,
-                            "lo": 2255862956726875978
+                            "hi": 1952381697784176686,
+                            "lo": 14313344291691588449
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5110442397934182473,
-                                  "lo": 2255862956726875978
+                                  "hi": 1952381697784176686,
+                                  "lo": 14313344291691588449
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5110442397934182473,
-                                  "lo": 2255862956726875978
+                                  "hi": 1952381697784176686,
+                                  "lo": 14313344291691588449
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5110442397934182473,
-                            "lo": 2255862956726875978
+                            "hi": 1952381697784176686,
+                            "lo": 14313344291691588449
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5110442397934182473,
-                            "lo": 2255862956726875978
+                            "hi": 1952381697784176686,
+                            "lo": 14313344291691588449
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 1952381697784176686,
+                            "lo": 14313344291691588449
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 5110442397934182473,
-                          "lo": 2255862956726875978
+                          "hi": 1952381697784176686,
+                          "lo": 14313344291691588449
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.183.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.183.json
index cf2be5c0..6d6e454b 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.183.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.183.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6960022157595761598,
-                    "lo": 3465962193586017530
+                    "hi": 3304069230788061094,
+                    "lo": 3795715203888825927
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6960022157595761598,
-                    "lo": 3465962193586017530
+                    "hi": 3304069230788061094,
+                    "lo": 3795715203888825927
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 6960022157595761598,
-                        "lo": 3465962193586017530
+                        "hi": 3304069230788061094,
+                        "lo": 3795715203888825927
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6960022157595761598,
-                            "lo": 3465962193586017530
+                            "hi": 3304069230788061094,
+                            "lo": 3795715203888825927
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6960022157595761598,
-                                  "lo": 3465962193586017530
+                                  "hi": 3304069230788061094,
+                                  "lo": 3795715203888825927
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6960022157595761598,
-                                  "lo": 3465962193586017530
+                                  "hi": 3304069230788061094,
+                                  "lo": 3795715203888825927
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6960022157595761598,
-                            "lo": 3465962193586017530
+                            "hi": 3304069230788061094,
+                            "lo": 3795715203888825927
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6960022157595761598,
-                            "lo": 3465962193586017530
+                            "hi": 3304069230788061094,
+                            "lo": 3795715203888825927
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 3304069230788061094,
+                            "lo": 3795715203888825927
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 6960022157595761598,
-                          "lo": 3465962193586017530
+                          "hi": 3304069230788061094,
+                          "lo": 3795715203888825927
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.184.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.184.json
index b11534d7..fba4d622 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.184.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.184.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6774181841866798399,
-                    "lo": 977903993255860221
+                    "hi": 258970310031091682,
+                    "lo": 4428149011366690197
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6774181841866798399,
-                    "lo": 977903993255860221
+                    "hi": 258970310031091682,
+                    "lo": 4428149011366690197
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 6774181841866798399,
-                        "lo": 977903993255860221
+                        "hi": 258970310031091682,
+                        "lo": 4428149011366690197
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6774181841866798399,
-                            "lo": 977903993255860221
+                            "hi": 258970310031091682,
+                            "lo": 4428149011366690197
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6774181841866798399,
-                                  "lo": 977903993255860221
+                                  "hi": 258970310031091682,
+                                  "lo": 4428149011366690197
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6774181841866798399,
-                                  "lo": 977903993255860221
+                                  "hi": 258970310031091682,
+                                  "lo": 4428149011366690197
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6774181841866798399,
-                            "lo": 977903993255860221
+                            "hi": 258970310031091682,
+                            "lo": 4428149011366690197
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6774181841866798399,
-                            "lo": 977903993255860221
+                            "hi": 258970310031091682,
+                            "lo": 4428149011366690197
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 258970310031091682,
+                            "lo": 4428149011366690197
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 6774181841866798399,
-                          "lo": 977903993255860221
+                          "hi": 258970310031091682,
+                          "lo": 4428149011366690197
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.185.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.185.json
index f96b7502..f96bdaf8 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.185.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.185.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3010718562440471425,
-                    "lo": 14317248684691622412
+                    "hi": 3104039676273362679,
+                    "lo": 11227958790291027991
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3010718562440471425,
-                    "lo": 14317248684691622412
+                    "hi": 3104039676273362679,
+                    "lo": 11227958790291027991
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 3010718562440471425,
-                        "lo": 14317248684691622412
+                        "hi": 3104039676273362679,
+                        "lo": 11227958790291027991
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3010718562440471425,
-                            "lo": 14317248684691622412
+                            "hi": 3104039676273362679,
+                            "lo": 11227958790291027991
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3010718562440471425,
-                                  "lo": 14317248684691622412
+                                  "hi": 3104039676273362679,
+                                  "lo": 11227958790291027991
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3010718562440471425,
-                                  "lo": 14317248684691622412
+                                  "hi": 3104039676273362679,
+                                  "lo": 11227958790291027991
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3010718562440471425,
-                            "lo": 14317248684691622412
+                            "hi": 3104039676273362679,
+                            "lo": 11227958790291027991
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3010718562440471425,
-                            "lo": 14317248684691622412
+                            "hi": 3104039676273362679,
+                            "lo": 11227958790291027991
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 3104039676273362679,
+                            "lo": 11227958790291027991
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 3010718562440471425,
-                          "lo": 14317248684691622412
+                          "hi": 3104039676273362679,
+                          "lo": 11227958790291027991
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.186.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.186.json
index 2f5e8e78..8901e3d0 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.186.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.186.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 837578315909065833,
-                    "lo": 1792408230004329130
+                    "hi": 1590291957521623546,
+                    "lo": 16306353878753701056
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 837578315909065833,
-                    "lo": 1792408230004329130
+                    "hi": 1590291957521623546,
+                    "lo": 16306353878753701056
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 837578315909065833,
-                        "lo": 1792408230004329130
+                        "hi": 1590291957521623546,
+                        "lo": 16306353878753701056
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 837578315909065833,
-                            "lo": 1792408230004329130
+                            "hi": 1590291957521623546,
+                            "lo": 16306353878753701056
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 837578315909065833,
-                                  "lo": 1792408230004329130
+                                  "hi": 1590291957521623546,
+                                  "lo": 16306353878753701056
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 837578315909065833,
-                                  "lo": 1792408230004329130
+                                  "hi": 1590291957521623546,
+                                  "lo": 16306353878753701056
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 837578315909065833,
-                            "lo": 1792408230004329130
+                            "hi": 1590291957521623546,
+                            "lo": 16306353878753701056
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 837578315909065833,
-                            "lo": 1792408230004329130
+                            "hi": 1590291957521623546,
+                            "lo": 16306353878753701056
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 1590291957521623546,
+                            "lo": 16306353878753701056
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 837578315909065833,
-                          "lo": 1792408230004329130
+                          "hi": 1590291957521623546,
+                          "lo": 16306353878753701056
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.187.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.187.json
index e7c4f36f..735c510e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.187.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.187.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5555405347434070146,
-                    "lo": 5082083239900803166
+                    "hi": 2498351415590395600,
+                    "lo": 13516425094173636591
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5555405347434070146,
-                    "lo": 5082083239900803166
+                    "hi": 2498351415590395600,
+                    "lo": 13516425094173636591
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 5555405347434070146,
-                        "lo": 5082083239900803166
+                        "hi": 2498351415590395600,
+                        "lo": 13516425094173636591
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5555405347434070146,
-                            "lo": 5082083239900803166
+                            "hi": 2498351415590395600,
+                            "lo": 13516425094173636591
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5555405347434070146,
-                                  "lo": 5082083239900803166
+                                  "hi": 2498351415590395600,
+                                  "lo": 13516425094173636591
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5555405347434070146,
-                                  "lo": 5082083239900803166
+                                  "hi": 2498351415590395600,
+                                  "lo": 13516425094173636591
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5555405347434070146,
-                            "lo": 5082083239900803166
+                            "hi": 2498351415590395600,
+                            "lo": 13516425094173636591
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5555405347434070146,
-                            "lo": 5082083239900803166
+                            "hi": 2498351415590395600,
+                            "lo": 13516425094173636591
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 2498351415590395600,
+                            "lo": 13516425094173636591
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 5555405347434070146,
-                          "lo": 5082083239900803166
+                          "hi": 2498351415590395600,
+                          "lo": 13516425094173636591
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.188.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.188.json
index 96b0f2db..40d15571 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.188.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.188.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2140593604151277664,
-                    "lo": 2027707391250752266
+                    "hi": 2551696169153819593,
+                    "lo": 15506520463173729139
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2140593604151277664,
-                    "lo": 2027707391250752266
+                    "hi": 2551696169153819593,
+                    "lo": 15506520463173729139
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 2140593604151277664,
-                        "lo": 2027707391250752266
+                        "hi": 2551696169153819593,
+                        "lo": 15506520463173729139
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2140593604151277664,
-                            "lo": 2027707391250752266
+                            "hi": 2551696169153819593,
+                            "lo": 15506520463173729139
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2140593604151277664,
-                                  "lo": 2027707391250752266
+                                  "hi": 2551696169153819593,
+                                  "lo": 15506520463173729139
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2140593604151277664,
-                                  "lo": 2027707391250752266
+                                  "hi": 2551696169153819593,
+                                  "lo": 15506520463173729139
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2140593604151277664,
-                            "lo": 2027707391250752266
+                            "hi": 2551696169153819593,
+                            "lo": 15506520463173729139
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2140593604151277664,
-                            "lo": 2027707391250752266
+                            "hi": 2551696169153819593,
+                            "lo": 15506520463173729139
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 2551696169153819593,
+                            "lo": 15506520463173729139
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 2140593604151277664,
-                          "lo": 2027707391250752266
+                          "hi": 2551696169153819593,
+                          "lo": 15506520463173729139
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.189.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.189.json
index d8c164c0..ab49bd72 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.189.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.189.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4603518980433038485,
-                    "lo": 6678156570325045066
+                    "hi": 1132867529425906230,
+                    "lo": 1310624570768983835
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4603518980433038485,
-                    "lo": 6678156570325045066
+                    "hi": 1132867529425906230,
+                    "lo": 1310624570768983835
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4603518980433038485,
-                        "lo": 6678156570325045066
+                        "hi": 1132867529425906230,
+                        "lo": 1310624570768983835
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4603518980433038485,
-                            "lo": 6678156570325045066
+                            "hi": 1132867529425906230,
+                            "lo": 1310624570768983835
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4603518980433038485,
-                                  "lo": 6678156570325045066
+                                  "hi": 1132867529425906230,
+                                  "lo": 1310624570768983835
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4603518980433038485,
-                                  "lo": 6678156570325045066
+                                  "hi": 1132867529425906230,
+                                  "lo": 1310624570768983835
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4603518980433038485,
-                            "lo": 6678156570325045066
+                            "hi": 1132867529425906230,
+                            "lo": 1310624570768983835
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4603518980433038485,
-                            "lo": 6678156570325045066
+                            "hi": 1132867529425906230,
+                            "lo": 1310624570768983835
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 1132867529425906230,
+                            "lo": 1310624570768983835
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4603518980433038485,
-                          "lo": 6678156570325045066
+                          "hi": 1132867529425906230,
+                          "lo": 1310624570768983835
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.19.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.19.json
index a359684f..ab44548e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.19.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.19.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8273167988608810256,
-                    "lo": 10686803001513029689
+                    "hi": 4916777377922508825,
+                    "lo": 18143979568533634952
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8273167988608810256,
-                    "lo": 10686803001513029689
+                    "hi": 4916777377922508825,
+                    "lo": 18143979568533634952
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 8273167988608810256,
-                        "lo": 10686803001513029689
+                        "hi": 4916777377922508825,
+                        "lo": 18143979568533634952
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8273167988608810256,
-                            "lo": 10686803001513029689
+                            "hi": 4916777377922508825,
+                            "lo": 18143979568533634952
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8273167988608810256,
-                                  "lo": 10686803001513029689
+                                  "hi": 4916777377922508825,
+                                  "lo": 18143979568533634952
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8273167988608810256,
-                                  "lo": 10686803001513029689
+                                  "hi": 4916777377922508825,
+                                  "lo": 18143979568533634952
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8273167988608810256,
-                            "lo": 10686803001513029689
+                            "hi": 4916777377922508825,
+                            "lo": 18143979568533634952
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8273167988608810256,
-                            "lo": 10686803001513029689
+                            "hi": 4916777377922508825,
+                            "lo": 18143979568533634952
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 4916777377922508825,
+                            "lo": 18143979568533634952
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 8273167988608810256,
-                          "lo": 10686803001513029689
+                          "hi": 4916777377922508825,
+                          "lo": 18143979568533634952
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.190.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.190.json
index 3301d342..b9dcd6df 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.190.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.190.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7396918941744526703,
-                    "lo": 9182564546884382095
+                    "hi": 3985152177544064069,
+                    "lo": 2225966927199193979
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7396918941744526703,
-                    "lo": 9182564546884382095
+                    "hi": 3985152177544064069,
+                    "lo": 2225966927199193979
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 7396918941744526703,
-                        "lo": 9182564546884382095
+                        "hi": 3985152177544064069,
+                        "lo": 2225966927199193979
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7396918941744526703,
-                            "lo": 9182564546884382095
+                            "hi": 3985152177544064069,
+                            "lo": 2225966927199193979
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7396918941744526703,
-                                  "lo": 9182564546884382095
+                                  "hi": 3985152177544064069,
+                                  "lo": 2225966927199193979
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7396918941744526703,
-                                  "lo": 9182564546884382095
+                                  "hi": 3985152177544064069,
+                                  "lo": 2225966927199193979
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7396918941744526703,
-                            "lo": 9182564546884382095
+                            "hi": 3985152177544064069,
+                            "lo": 2225966927199193979
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7396918941744526703,
-                            "lo": 9182564546884382095
+                            "hi": 3985152177544064069,
+                            "lo": 2225966927199193979
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 3985152177544064069,
+                            "lo": 2225966927199193979
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 7396918941744526703,
-                          "lo": 9182564546884382095
+                          "hi": 3985152177544064069,
+                          "lo": 2225966927199193979
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.191.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.191.json
index af3bd6f1..a673fdd4 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.191.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.191.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8609532680192515310,
-                    "lo": 6658735938517711275
+                    "hi": 7241884749931709374,
+                    "lo": 6277720648630059457
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8609532680192515310,
-                    "lo": 6658735938517711275
+                    "hi": 7241884749931709374,
+                    "lo": 6277720648630059457
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 8609532680192515310,
-                        "lo": 6658735938517711275
+                        "hi": 7241884749931709374,
+                        "lo": 6277720648630059457
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8609532680192515310,
-                            "lo": 6658735938517711275
+                            "hi": 7241884749931709374,
+                            "lo": 6277720648630059457
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8609532680192515310,
-                                  "lo": 6658735938517711275
+                                  "hi": 7241884749931709374,
+                                  "lo": 6277720648630059457
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8609532680192515310,
-                                  "lo": 6658735938517711275
+                                  "hi": 7241884749931709374,
+                                  "lo": 6277720648630059457
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8609532680192515310,
-                            "lo": 6658735938517711275
+                            "hi": 7241884749931709374,
+                            "lo": 6277720648630059457
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8609532680192515310,
-                            "lo": 6658735938517711275
+                            "hi": 7241884749931709374,
+                            "lo": 6277720648630059457
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 7241884749931709374,
+                            "lo": 6277720648630059457
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 8609532680192515310,
-                          "lo": 6658735938517711275
+                          "hi": 7241884749931709374,
+                          "lo": 6277720648630059457
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.192.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.192.json
index 8b3df3a2..d48a41b6 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.192.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.192.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3679612410569671300,
-                    "lo": 8073813542244260736
+                    "hi": 1363663304133581478,
+                    "lo": 6116803671954571120
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3679612410569671300,
-                    "lo": 8073813542244260736
+                    "hi": 1363663304133581478,
+                    "lo": 6116803671954571120
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 3679612410569671300,
-                        "lo": 8073813542244260736
+                        "hi": 1363663304133581478,
+                        "lo": 6116803671954571120
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3679612410569671300,
-                            "lo": 8073813542244260736
+                            "hi": 1363663304133581478,
+                            "lo": 6116803671954571120
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3679612410569671300,
-                                  "lo": 8073813542244260736
+                                  "hi": 1363663304133581478,
+                                  "lo": 6116803671954571120
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3679612410569671300,
-                                  "lo": 8073813542244260736
+                                  "hi": 1363663304133581478,
+                                  "lo": 6116803671954571120
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3679612410569671300,
-                            "lo": 8073813542244260736
+                            "hi": 1363663304133581478,
+                            "lo": 6116803671954571120
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3679612410569671300,
-                            "lo": 8073813542244260736
+                            "hi": 1363663304133581478,
+                            "lo": 6116803671954571120
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 1363663304133581478,
+                            "lo": 6116803671954571120
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 3679612410569671300,
-                          "lo": 8073813542244260736
+                          "hi": 1363663304133581478,
+                          "lo": 6116803671954571120
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.193.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.193.json
index 58f519e2..0f70e70a 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.193.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.193.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5983605904490033672,
-                    "lo": 2975365107533322048
+                    "hi": 2603202666360531259,
+                    "lo": 4021038330388801272
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5983605904490033672,
-                    "lo": 2975365107533322048
+                    "hi": 2603202666360531259,
+                    "lo": 4021038330388801272
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 5983605904490033672,
-                        "lo": 2975365107533322048
+                        "hi": 2603202666360531259,
+                        "lo": 4021038330388801272
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5983605904490033672,
-                            "lo": 2975365107533322048
+                            "hi": 2603202666360531259,
+                            "lo": 4021038330388801272
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5983605904490033672,
-                                  "lo": 2975365107533322048
+                                  "hi": 2603202666360531259,
+                                  "lo": 4021038330388801272
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5983605904490033672,
-                                  "lo": 2975365107533322048
+                                  "hi": 2603202666360531259,
+                                  "lo": 4021038330388801272
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5983605904490033672,
-                            "lo": 2975365107533322048
+                            "hi": 2603202666360531259,
+                            "lo": 4021038330388801272
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5983605904490033672,
-                            "lo": 2975365107533322048
+                            "hi": 2603202666360531259,
+                            "lo": 4021038330388801272
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 2603202666360531259,
+                            "lo": 4021038330388801272
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 5983605904490033672,
-                          "lo": 2975365107533322048
+                          "hi": 2603202666360531259,
+                          "lo": 4021038330388801272
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.194.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.194.json
index 0ef6701c..7dd47645 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.194.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.194.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7206322516337698672,
-                    "lo": 12144679892656865997
+                    "hi": 8527111784707437874,
+                    "lo": 13169005905517754569
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7206322516337698672,
-                    "lo": 12144679892656865997
+                    "hi": 8527111784707437874,
+                    "lo": 13169005905517754569
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 7206322516337698672,
-                        "lo": 12144679892656865997
+                        "hi": 8527111784707437874,
+                        "lo": 13169005905517754569
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7206322516337698672,
-                            "lo": 12144679892656865997
+                            "hi": 8527111784707437874,
+                            "lo": 13169005905517754569
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7206322516337698672,
-                                  "lo": 12144679892656865997
+                                  "hi": 8527111784707437874,
+                                  "lo": 13169005905517754569
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7206322516337698672,
-                                  "lo": 12144679892656865997
+                                  "hi": 8527111784707437874,
+                                  "lo": 13169005905517754569
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7206322516337698672,
-                            "lo": 12144679892656865997
+                            "hi": 8527111784707437874,
+                            "lo": 13169005905517754569
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7206322516337698672,
-                            "lo": 12144679892656865997
+                            "hi": 8527111784707437874,
+                            "lo": 13169005905517754569
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 8527111784707437874,
+                            "lo": 13169005905517754569
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 7206322516337698672,
-                          "lo": 12144679892656865997
+                          "hi": 8527111784707437874,
+                          "lo": 13169005905517754569
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.195.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.195.json
index 2d0bda12..7a5f8dbd 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.195.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.195.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2021064496673740533,
-                    "lo": 15961061174643513658
+                    "hi": 3775019176285626330,
+                    "lo": 15945307334185789000
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2021064496673740533,
-                    "lo": 15961061174643513658
+                    "hi": 3775019176285626330,
+                    "lo": 15945307334185789000
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 2021064496673740533,
-                        "lo": 15961061174643513658
+                        "hi": 3775019176285626330,
+                        "lo": 15945307334185789000
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2021064496673740533,
-                            "lo": 15961061174643513658
+                            "hi": 3775019176285626330,
+                            "lo": 15945307334185789000
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2021064496673740533,
-                                  "lo": 15961061174643513658
+                                  "hi": 3775019176285626330,
+                                  "lo": 15945307334185789000
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2021064496673740533,
-                                  "lo": 15961061174643513658
+                                  "hi": 3775019176285626330,
+                                  "lo": 15945307334185789000
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2021064496673740533,
-                            "lo": 15961061174643513658
+                            "hi": 3775019176285626330,
+                            "lo": 15945307334185789000
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2021064496673740533,
-                            "lo": 15961061174643513658
+                            "hi": 3775019176285626330,
+                            "lo": 15945307334185789000
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 3775019176285626330,
+                            "lo": 15945307334185789000
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 2021064496673740533,
-                          "lo": 15961061174643513658
+                          "hi": 3775019176285626330,
+                          "lo": 15945307334185789000
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.196.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.196.json
index 13b98ebb..3cc1c805 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.196.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.196.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4349076405004800855,
-                    "lo": 10209816941431628014
+                    "hi": 2432247093326115920,
+                    "lo": 13308665966361059179
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4349076405004800855,
-                    "lo": 10209816941431628014
+                    "hi": 2432247093326115920,
+                    "lo": 13308665966361059179
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4349076405004800855,
-                        "lo": 10209816941431628014
+                        "hi": 2432247093326115920,
+                        "lo": 13308665966361059179
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4349076405004800855,
-                            "lo": 10209816941431628014
+                            "hi": 2432247093326115920,
+                            "lo": 13308665966361059179
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4349076405004800855,
-                                  "lo": 10209816941431628014
+                                  "hi": 2432247093326115920,
+                                  "lo": 13308665966361059179
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4349076405004800855,
-                                  "lo": 10209816941431628014
+                                  "hi": 2432247093326115920,
+                                  "lo": 13308665966361059179
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4349076405004800855,
-                            "lo": 10209816941431628014
+                            "hi": 2432247093326115920,
+                            "lo": 13308665966361059179
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4349076405004800855,
-                            "lo": 10209816941431628014
+                            "hi": 2432247093326115920,
+                            "lo": 13308665966361059179
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 2432247093326115920,
+                            "lo": 13308665966361059179
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4349076405004800855,
-                          "lo": 10209816941431628014
+                          "hi": 2432247093326115920,
+                          "lo": 13308665966361059179
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.197.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.197.json
index e6f23048..6a1b5f25 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.197.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.197.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4397708152305524615,
-                    "lo": 10513956637593968957
+                    "hi": 7643458138476723619,
+                    "lo": 7996171279757244025
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4397708152305524615,
-                    "lo": 10513956637593968957
+                    "hi": 7643458138476723619,
+                    "lo": 7996171279757244025
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4397708152305524615,
-                        "lo": 10513956637593968957
+                        "hi": 7643458138476723619,
+                        "lo": 7996171279757244025
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4397708152305524615,
-                            "lo": 10513956637593968957
+                            "hi": 7643458138476723619,
+                            "lo": 7996171279757244025
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4397708152305524615,
-                                  "lo": 10513956637593968957
+                                  "hi": 7643458138476723619,
+                                  "lo": 7996171279757244025
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4397708152305524615,
-                                  "lo": 10513956637593968957
+                                  "hi": 7643458138476723619,
+                                  "lo": 7996171279757244025
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4397708152305524615,
-                            "lo": 10513956637593968957
+                            "hi": 7643458138476723619,
+                            "lo": 7996171279757244025
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4397708152305524615,
-                            "lo": 10513956637593968957
+                            "hi": 7643458138476723619,
+                            "lo": 7996171279757244025
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 7643458138476723619,
+                            "lo": 7996171279757244025
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4397708152305524615,
-                          "lo": 10513956637593968957
+                          "hi": 7643458138476723619,
+                          "lo": 7996171279757244025
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.198.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.198.json
index 316a3442..6ce9ac5f 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.198.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.198.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7282634711142453015,
-                    "lo": 6616544861867452667
+                    "hi": 752073196650528486,
+                    "lo": 3858539985777638209
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7282634711142453015,
-                    "lo": 6616544861867452667
+                    "hi": 752073196650528486,
+                    "lo": 3858539985777638209
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 7282634711142453015,
-                        "lo": 6616544861867452667
+                        "hi": 752073196650528486,
+                        "lo": 3858539985777638209
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7282634711142453015,
-                            "lo": 6616544861867452667
+                            "hi": 752073196650528486,
+                            "lo": 3858539985777638209
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7282634711142453015,
-                                  "lo": 6616544861867452667
+                                  "hi": 752073196650528486,
+                                  "lo": 3858539985777638209
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7282634711142453015,
-                                  "lo": 6616544861867452667
+                                  "hi": 752073196650528486,
+                                  "lo": 3858539985777638209
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7282634711142453015,
-                            "lo": 6616544861867452667
+                            "hi": 752073196650528486,
+                            "lo": 3858539985777638209
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7282634711142453015,
-                            "lo": 6616544861867452667
+                            "hi": 752073196650528486,
+                            "lo": 3858539985777638209
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 752073196650528486,
+                            "lo": 3858539985777638209
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 7282634711142453015,
-                          "lo": 6616544861867452667
+                          "hi": 752073196650528486,
+                          "lo": 3858539985777638209
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.199.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.199.json
index 96f5e6b0..1ae00e9f 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.199.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.199.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3937396379357311806,
-                    "lo": 5936712082567275416
+                    "hi": 4538397750275241726,
+                    "lo": 17923061237266357184
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3937396379357311806,
-                    "lo": 5936712082567275416
+                    "hi": 4538397750275241726,
+                    "lo": 17923061237266357184
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 3937396379357311806,
-                        "lo": 5936712082567275416
+                        "hi": 4538397750275241726,
+                        "lo": 17923061237266357184
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3937396379357311806,
-                            "lo": 5936712082567275416
+                            "hi": 4538397750275241726,
+                            "lo": 17923061237266357184
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3937396379357311806,
-                                  "lo": 5936712082567275416
+                                  "hi": 4538397750275241726,
+                                  "lo": 17923061237266357184
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3937396379357311806,
-                                  "lo": 5936712082567275416
+                                  "hi": 4538397750275241726,
+                                  "lo": 17923061237266357184
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3937396379357311806,
-                            "lo": 5936712082567275416
+                            "hi": 4538397750275241726,
+                            "lo": 17923061237266357184
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3937396379357311806,
-                            "lo": 5936712082567275416
+                            "hi": 4538397750275241726,
+                            "lo": 17923061237266357184
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 4538397750275241726,
+                            "lo": 17923061237266357184
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 3937396379357311806,
-                          "lo": 5936712082567275416
+                          "hi": 4538397750275241726,
+                          "lo": 17923061237266357184
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.2.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.2.json
index 294dbe8c..7d1f88b1 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.2.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.2.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6548257881746696321,
-                    "lo": 1504257198142447190
+                    "hi": 2142854847535787545,
+                    "lo": 417362885902746650
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6548257881746696321,
-                    "lo": 1504257198142447190
+                    "hi": 2142854847535787545,
+                    "lo": 417362885902746650
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 6548257881746696321,
-                        "lo": 1504257198142447190
+                        "hi": 2142854847535787545,
+                        "lo": 417362885902746650
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6548257881746696321,
-                            "lo": 1504257198142447190
+                            "hi": 2142854847535787545,
+                            "lo": 417362885902746650
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6548257881746696321,
-                                  "lo": 1504257198142447190
+                                  "hi": 2142854847535787545,
+                                  "lo": 417362885902746650
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6548257881746696321,
-                                  "lo": 1504257198142447190
+                                  "hi": 2142854847535787545,
+                                  "lo": 417362885902746650
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6548257881746696321,
-                            "lo": 1504257198142447190
+                            "hi": 2142854847535787545,
+                            "lo": 417362885902746650
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6548257881746696321,
-                            "lo": 1504257198142447190
+                            "hi": 2142854847535787545,
+                            "lo": 417362885902746650
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 2142854847535787545,
+                            "lo": 417362885902746650
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 6548257881746696321,
-                          "lo": 1504257198142447190
+                          "hi": 2142854847535787545,
+                          "lo": 417362885902746650
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.20.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.20.json
index bc3d26b4..d203d970 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.20.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.20.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7427595095570037005,
-                    "lo": 13724482634691216609
+                    "hi": 1558777654119983603,
+                    "lo": 11616565830520793771
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7427595095570037005,
-                    "lo": 13724482634691216609
+                    "hi": 1558777654119983603,
+                    "lo": 11616565830520793771
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 7427595095570037005,
-                        "lo": 13724482634691216609
+                        "hi": 1558777654119983603,
+                        "lo": 11616565830520793771
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7427595095570037005,
-                            "lo": 13724482634691216609
+                            "hi": 1558777654119983603,
+                            "lo": 11616565830520793771
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7427595095570037005,
-                                  "lo": 13724482634691216609
+                                  "hi": 1558777654119983603,
+                                  "lo": 11616565830520793771
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7427595095570037005,
-                                  "lo": 13724482634691216609
+                                  "hi": 1558777654119983603,
+                                  "lo": 11616565830520793771
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7427595095570037005,
-                            "lo": 13724482634691216609
+                            "hi": 1558777654119983603,
+                            "lo": 11616565830520793771
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7427595095570037005,
-                            "lo": 13724482634691216609
+                            "hi": 1558777654119983603,
+                            "lo": 11616565830520793771
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 1558777654119983603,
+                            "lo": 11616565830520793771
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 7427595095570037005,
-                          "lo": 13724482634691216609
+                          "hi": 1558777654119983603,
+                          "lo": 11616565830520793771
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.200.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.200.json
index 3a830acc..e3f2e6dd 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.200.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.200.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6767319093341626042,
-                    "lo": 16674593524760943283
+                    "hi": 5814918511482643818,
+                    "lo": 2974311082470498514
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6767319093341626042,
-                    "lo": 16674593524760943283
+                    "hi": 5814918511482643818,
+                    "lo": 2974311082470498514
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 6767319093341626042,
-                        "lo": 16674593524760943283
+                        "hi": 5814918511482643818,
+                        "lo": 2974311082470498514
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6767319093341626042,
-                            "lo": 16674593524760943283
+                            "hi": 5814918511482643818,
+                            "lo": 2974311082470498514
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6767319093341626042,
-                                  "lo": 16674593524760943283
+                                  "hi": 5814918511482643818,
+                                  "lo": 2974311082470498514
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6767319093341626042,
-                                  "lo": 16674593524760943283
+                                  "hi": 5814918511482643818,
+                                  "lo": 2974311082470498514
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6767319093341626042,
-                            "lo": 16674593524760943283
+                            "hi": 5814918511482643818,
+                            "lo": 2974311082470498514
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6767319093341626042,
-                            "lo": 16674593524760943283
+                            "hi": 5814918511482643818,
+                            "lo": 2974311082470498514
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 5814918511482643818,
+                            "lo": 2974311082470498514
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 6767319093341626042,
-                          "lo": 16674593524760943283
+                          "hi": 5814918511482643818,
+                          "lo": 2974311082470498514
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.201.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.201.json
index 7bd29b91..71a91ebd 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.201.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.201.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3257119442226831270,
-                    "lo": 7091579608194161335
+                    "hi": 8975953234722316233,
+                    "lo": 17745126751339340352
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3257119442226831270,
-                    "lo": 7091579608194161335
+                    "hi": 8975953234722316233,
+                    "lo": 17745126751339340352
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 3257119442226831270,
-                        "lo": 7091579608194161335
+                        "hi": 8975953234722316233,
+                        "lo": 17745126751339340352
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3257119442226831270,
-                            "lo": 7091579608194161335
+                            "hi": 8975953234722316233,
+                            "lo": 17745126751339340352
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3257119442226831270,
-                                  "lo": 7091579608194161335
+                                  "hi": 8975953234722316233,
+                                  "lo": 17745126751339340352
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3257119442226831270,
-                                  "lo": 7091579608194161335
+                                  "hi": 8975953234722316233,
+                                  "lo": 17745126751339340352
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3257119442226831270,
-                            "lo": 7091579608194161335
+                            "hi": 8975953234722316233,
+                            "lo": 17745126751339340352
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3257119442226831270,
-                            "lo": 7091579608194161335
+                            "hi": 8975953234722316233,
+                            "lo": 17745126751339340352
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 8975953234722316233,
+                            "lo": 17745126751339340352
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 3257119442226831270,
-                          "lo": 7091579608194161335
+                          "hi": 8975953234722316233,
+                          "lo": 17745126751339340352
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.202.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.202.json
index 9dbb6e65..a6270b11 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.202.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.202.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 777781517766664281,
-                    "lo": 16148402641582586115
+                    "hi": 6245969564203283086,
+                    "lo": 11507579637379332077
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 777781517766664281,
-                    "lo": 16148402641582586115
+                    "hi": 6245969564203283086,
+                    "lo": 11507579637379332077
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 777781517766664281,
-                        "lo": 16148402641582586115
+                        "hi": 6245969564203283086,
+                        "lo": 11507579637379332077
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 777781517766664281,
-                            "lo": 16148402641582586115
+                            "hi": 6245969564203283086,
+                            "lo": 11507579637379332077
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 777781517766664281,
-                                  "lo": 16148402641582586115
+                                  "hi": 6245969564203283086,
+                                  "lo": 11507579637379332077
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 777781517766664281,
-                                  "lo": 16148402641582586115
+                                  "hi": 6245969564203283086,
+                                  "lo": 11507579637379332077
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 777781517766664281,
-                            "lo": 16148402641582586115
+                            "hi": 6245969564203283086,
+                            "lo": 11507579637379332077
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 777781517766664281,
-                            "lo": 16148402641582586115
+                            "hi": 6245969564203283086,
+                            "lo": 11507579637379332077
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 6245969564203283086,
+                            "lo": 11507579637379332077
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 777781517766664281,
-                          "lo": 16148402641582586115
+                          "hi": 6245969564203283086,
+                          "lo": 11507579637379332077
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.203.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.203.json
index 0c187ae1..1c8953e5 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.203.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.203.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7740367676355519132,
-                    "lo": 16440097074431388700
+                    "hi": 6061599301457042803,
+                    "lo": 11395433837258023301
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7740367676355519132,
-                    "lo": 16440097074431388700
+                    "hi": 6061599301457042803,
+                    "lo": 11395433837258023301
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 7740367676355519132,
-                        "lo": 16440097074431388700
+                        "hi": 6061599301457042803,
+                        "lo": 11395433837258023301
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7740367676355519132,
-                            "lo": 16440097074431388700
+                            "hi": 6061599301457042803,
+                            "lo": 11395433837258023301
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7740367676355519132,
-                                  "lo": 16440097074431388700
+                                  "hi": 6061599301457042803,
+                                  "lo": 11395433837258023301
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7740367676355519132,
-                                  "lo": 16440097074431388700
+                                  "hi": 6061599301457042803,
+                                  "lo": 11395433837258023301
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7740367676355519132,
-                            "lo": 16440097074431388700
+                            "hi": 6061599301457042803,
+                            "lo": 11395433837258023301
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7740367676355519132,
-                            "lo": 16440097074431388700
+                            "hi": 6061599301457042803,
+                            "lo": 11395433837258023301
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 6061599301457042803,
+                            "lo": 11395433837258023301
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 7740367676355519132,
-                          "lo": 16440097074431388700
+                          "hi": 6061599301457042803,
+                          "lo": 11395433837258023301
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.204.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.204.json
index 00012b80..bd7f920c 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.204.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.204.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4384584260815729322,
-                    "lo": 2940748902505189590
+                    "hi": 7383174657095988164,
+                    "lo": 16323918484484955725
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4384584260815729322,
-                    "lo": 2940748902505189590
+                    "hi": 7383174657095988164,
+                    "lo": 16323918484484955725
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4384584260815729322,
-                        "lo": 2940748902505189590
+                        "hi": 7383174657095988164,
+                        "lo": 16323918484484955725
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4384584260815729322,
-                            "lo": 2940748902505189590
+                            "hi": 7383174657095988164,
+                            "lo": 16323918484484955725
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4384584260815729322,
-                                  "lo": 2940748902505189590
+                                  "hi": 7383174657095988164,
+                                  "lo": 16323918484484955725
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4384584260815729322,
-                                  "lo": 2940748902505189590
+                                  "hi": 7383174657095988164,
+                                  "lo": 16323918484484955725
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4384584260815729322,
-                            "lo": 2940748902505189590
+                            "hi": 7383174657095988164,
+                            "lo": 16323918484484955725
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4384584260815729322,
-                            "lo": 2940748902505189590
+                            "hi": 7383174657095988164,
+                            "lo": 16323918484484955725
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 7383174657095988164,
+                            "lo": 16323918484484955725
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4384584260815729322,
-                          "lo": 2940748902505189590
+                          "hi": 7383174657095988164,
+                          "lo": 16323918484484955725
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.205.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.205.json
index 0c467b1e..304d67be 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.205.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.205.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4840124805939625041,
-                    "lo": 310238441627811634
+                    "hi": 4792410208202493842,
+                    "lo": 3273210766169256828
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4840124805939625041,
-                    "lo": 310238441627811634
+                    "hi": 4792410208202493842,
+                    "lo": 3273210766169256828
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4840124805939625041,
-                        "lo": 310238441627811634
+                        "hi": 4792410208202493842,
+                        "lo": 3273210766169256828
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4840124805939625041,
-                            "lo": 310238441627811634
+                            "hi": 4792410208202493842,
+                            "lo": 3273210766169256828
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4840124805939625041,
-                                  "lo": 310238441627811634
+                                  "hi": 4792410208202493842,
+                                  "lo": 3273210766169256828
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4840124805939625041,
-                                  "lo": 310238441627811634
+                                  "hi": 4792410208202493842,
+                                  "lo": 3273210766169256828
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4840124805939625041,
-                            "lo": 310238441627811634
+                            "hi": 4792410208202493842,
+                            "lo": 3273210766169256828
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4840124805939625041,
-                            "lo": 310238441627811634
+                            "hi": 4792410208202493842,
+                            "lo": 3273210766169256828
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 4792410208202493842,
+                            "lo": 3273210766169256828
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4840124805939625041,
-                          "lo": 310238441627811634
+                          "hi": 4792410208202493842,
+                          "lo": 3273210766169256828
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.206.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.206.json
index b601c31c..bff1d19f 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.206.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.206.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1247302721004111900,
-                    "lo": 5468104099855903897
+                    "hi": 917635795352807149,
+                    "lo": 281138442731813454
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1247302721004111900,
-                    "lo": 5468104099855903897
+                    "hi": 917635795352807149,
+                    "lo": 281138442731813454
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 1247302721004111900,
-                        "lo": 5468104099855903897
+                        "hi": 917635795352807149,
+                        "lo": 281138442731813454
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1247302721004111900,
-                            "lo": 5468104099855903897
+                            "hi": 917635795352807149,
+                            "lo": 281138442731813454
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 1247302721004111900,
-                                  "lo": 5468104099855903897
+                                  "hi": 917635795352807149,
+                                  "lo": 281138442731813454
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 1247302721004111900,
-                                  "lo": 5468104099855903897
+                                  "hi": 917635795352807149,
+                                  "lo": 281138442731813454
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1247302721004111900,
-                            "lo": 5468104099855903897
+                            "hi": 917635795352807149,
+                            "lo": 281138442731813454
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1247302721004111900,
-                            "lo": 5468104099855903897
+                            "hi": 917635795352807149,
+                            "lo": 281138442731813454
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 917635795352807149,
+                            "lo": 281138442731813454
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 1247302721004111900,
-                          "lo": 5468104099855903897
+                          "hi": 917635795352807149,
+                          "lo": 281138442731813454
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.207.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.207.json
index 803e73fd..661ffc04 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.207.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.207.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6258324282495306484,
-                    "lo": 14483197103828560003
+                    "hi": 6671249022129527419,
+                    "lo": 3270923835761426796
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6258324282495306484,
-                    "lo": 14483197103828560003
+                    "hi": 6671249022129527419,
+                    "lo": 3270923835761426796
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 6258324282495306484,
-                        "lo": 14483197103828560003
+                        "hi": 6671249022129527419,
+                        "lo": 3270923835761426796
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6258324282495306484,
-                            "lo": 14483197103828560003
+                            "hi": 6671249022129527419,
+                            "lo": 3270923835761426796
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6258324282495306484,
-                                  "lo": 14483197103828560003
+                                  "hi": 6671249022129527419,
+                                  "lo": 3270923835761426796
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6258324282495306484,
-                                  "lo": 14483197103828560003
+                                  "hi": 6671249022129527419,
+                                  "lo": 3270923835761426796
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6258324282495306484,
-                            "lo": 14483197103828560003
+                            "hi": 6671249022129527419,
+                            "lo": 3270923835761426796
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6258324282495306484,
-                            "lo": 14483197103828560003
+                            "hi": 6671249022129527419,
+                            "lo": 3270923835761426796
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 6671249022129527419,
+                            "lo": 3270923835761426796
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 6258324282495306484,
-                          "lo": 14483197103828560003
+                          "hi": 6671249022129527419,
+                          "lo": 3270923835761426796
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.208.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.208.json
index b74d50d1..4b05e65b 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.208.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.208.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 440641790156859729,
-                    "lo": 12999473367809245874
+                    "hi": 8191048361296393288,
+                    "lo": 2630290391351467170
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 440641790156859729,
-                    "lo": 12999473367809245874
+                    "hi": 8191048361296393288,
+                    "lo": 2630290391351467170
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 440641790156859729,
-                        "lo": 12999473367809245874
+                        "hi": 8191048361296393288,
+                        "lo": 2630290391351467170
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 440641790156859729,
-                            "lo": 12999473367809245874
+                            "hi": 8191048361296393288,
+                            "lo": 2630290391351467170
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 440641790156859729,
-                                  "lo": 12999473367809245874
+                                  "hi": 8191048361296393288,
+                                  "lo": 2630290391351467170
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 440641790156859729,
-                                  "lo": 12999473367809245874
+                                  "hi": 8191048361296393288,
+                                  "lo": 2630290391351467170
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 440641790156859729,
-                            "lo": 12999473367809245874
+                            "hi": 8191048361296393288,
+                            "lo": 2630290391351467170
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 440641790156859729,
-                            "lo": 12999473367809245874
+                            "hi": 8191048361296393288,
+                            "lo": 2630290391351467170
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 8191048361296393288,
+                            "lo": 2630290391351467170
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 440641790156859729,
-                          "lo": 12999473367809245874
+                          "hi": 8191048361296393288,
+                          "lo": 2630290391351467170
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.209.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.209.json
index 3e48cc42..1dd1859f 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.209.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.209.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 821913378150407507,
-                    "lo": 17362458988953495474
+                    "hi": 5586645939747494179,
+                    "lo": 10993371809938785802
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 821913378150407507,
-                    "lo": 17362458988953495474
+                    "hi": 5586645939747494179,
+                    "lo": 10993371809938785802
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 821913378150407507,
-                        "lo": 17362458988953495474
+                        "hi": 5586645939747494179,
+                        "lo": 10993371809938785802
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 821913378150407507,
-                            "lo": 17362458988953495474
+                            "hi": 5586645939747494179,
+                            "lo": 10993371809938785802
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 821913378150407507,
-                                  "lo": 17362458988953495474
+                                  "hi": 5586645939747494179,
+                                  "lo": 10993371809938785802
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 821913378150407507,
-                                  "lo": 17362458988953495474
+                                  "hi": 5586645939747494179,
+                                  "lo": 10993371809938785802
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 821913378150407507,
-                            "lo": 17362458988953495474
+                            "hi": 5586645939747494179,
+                            "lo": 10993371809938785802
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 821913378150407507,
-                            "lo": 17362458988953495474
+                            "hi": 5586645939747494179,
+                            "lo": 10993371809938785802
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 5586645939747494179,
+                            "lo": 10993371809938785802
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 821913378150407507,
-                          "lo": 17362458988953495474
+                          "hi": 5586645939747494179,
+                          "lo": 10993371809938785802
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.21.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.21.json
index 769c7fdb..3ce62694 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.21.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.21.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4056896611840942137,
-                    "lo": 12292709984211961899
+                    "hi": 653007650902748592,
+                    "lo": 16189601311109832308
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4056896611840942137,
-                    "lo": 12292709984211961899
+                    "hi": 653007650902748592,
+                    "lo": 16189601311109832308
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4056896611840942137,
-                        "lo": 12292709984211961899
+                        "hi": 653007650902748592,
+                        "lo": 16189601311109832308
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4056896611840942137,
-                            "lo": 12292709984211961899
+                            "hi": 653007650902748592,
+                            "lo": 16189601311109832308
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4056896611840942137,
-                                  "lo": 12292709984211961899
+                                  "hi": 653007650902748592,
+                                  "lo": 16189601311109832308
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4056896611840942137,
-                                  "lo": 12292709984211961899
+                                  "hi": 653007650902748592,
+                                  "lo": 16189601311109832308
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4056896611840942137,
-                            "lo": 12292709984211961899
+                            "hi": 653007650902748592,
+                            "lo": 16189601311109832308
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4056896611840942137,
-                            "lo": 12292709984211961899
+                            "hi": 653007650902748592,
+                            "lo": 16189601311109832308
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 653007650902748592,
+                            "lo": 16189601311109832308
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4056896611840942137,
-                          "lo": 12292709984211961899
+                          "hi": 653007650902748592,
+                          "lo": 16189601311109832308
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.210.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.210.json
index d4145a0c..25fefd89 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.210.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.210.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3671061527195761164,
-                    "lo": 5286870167188198671
+                    "hi": 1652973531617333080,
+                    "lo": 5863351075127332888
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3671061527195761164,
-                    "lo": 5286870167188198671
+                    "hi": 1652973531617333080,
+                    "lo": 5863351075127332888
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 3671061527195761164,
-                        "lo": 5286870167188198671
+                        "hi": 1652973531617333080,
+                        "lo": 5863351075127332888
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3671061527195761164,
-                            "lo": 5286870167188198671
+                            "hi": 1652973531617333080,
+                            "lo": 5863351075127332888
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3671061527195761164,
-                                  "lo": 5286870167188198671
+                                  "hi": 1652973531617333080,
+                                  "lo": 5863351075127332888
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3671061527195761164,
-                                  "lo": 5286870167188198671
+                                  "hi": 1652973531617333080,
+                                  "lo": 5863351075127332888
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3671061527195761164,
-                            "lo": 5286870167188198671
+                            "hi": 1652973531617333080,
+                            "lo": 5863351075127332888
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3671061527195761164,
-                            "lo": 5286870167188198671
+                            "hi": 1652973531617333080,
+                            "lo": 5863351075127332888
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 1652973531617333080,
+                            "lo": 5863351075127332888
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 3671061527195761164,
-                          "lo": 5286870167188198671
+                          "hi": 1652973531617333080,
+                          "lo": 5863351075127332888
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.211.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.211.json
index b43557e2..56f690d9 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.211.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.211.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2939723850428508802,
-                    "lo": 10580036521878017476
+                    "hi": 245010443719866258,
+                    "lo": 390244077545676267
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2939723850428508802,
-                    "lo": 10580036521878017476
+                    "hi": 245010443719866258,
+                    "lo": 390244077545676267
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 2939723850428508802,
-                        "lo": 10580036521878017476
+                        "hi": 245010443719866258,
+                        "lo": 390244077545676267
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2939723850428508802,
-                            "lo": 10580036521878017476
+                            "hi": 245010443719866258,
+                            "lo": 390244077545676267
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2939723850428508802,
-                                  "lo": 10580036521878017476
+                                  "hi": 245010443719866258,
+                                  "lo": 390244077545676267
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2939723850428508802,
-                                  "lo": 10580036521878017476
+                                  "hi": 245010443719866258,
+                                  "lo": 390244077545676267
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2939723850428508802,
-                            "lo": 10580036521878017476
+                            "hi": 245010443719866258,
+                            "lo": 390244077545676267
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2939723850428508802,
-                            "lo": 10580036521878017476
+                            "hi": 245010443719866258,
+                            "lo": 390244077545676267
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 245010443719866258,
+                            "lo": 390244077545676267
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 2939723850428508802,
-                          "lo": 10580036521878017476
+                          "hi": 245010443719866258,
+                          "lo": 390244077545676267
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.212.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.212.json
index 12a950a2..b282e50d 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.212.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.212.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2910964310289565509,
-                    "lo": 10120401524168048460
+                    "hi": 8932425028074627537,
+                    "lo": 6932773600000067732
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2910964310289565509,
-                    "lo": 10120401524168048460
+                    "hi": 8932425028074627537,
+                    "lo": 6932773600000067732
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 2910964310289565509,
-                        "lo": 10120401524168048460
+                        "hi": 8932425028074627537,
+                        "lo": 6932773600000067732
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2910964310289565509,
-                            "lo": 10120401524168048460
+                            "hi": 8932425028074627537,
+                            "lo": 6932773600000067732
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2910964310289565509,
-                                  "lo": 10120401524168048460
+                                  "hi": 8932425028074627537,
+                                  "lo": 6932773600000067732
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2910964310289565509,
-                                  "lo": 10120401524168048460
+                                  "hi": 8932425028074627537,
+                                  "lo": 6932773600000067732
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2910964310289565509,
-                            "lo": 10120401524168048460
+                            "hi": 8932425028074627537,
+                            "lo": 6932773600000067732
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2910964310289565509,
-                            "lo": 10120401524168048460
+                            "hi": 8932425028074627537,
+                            "lo": 6932773600000067732
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 8932425028074627537,
+                            "lo": 6932773600000067732
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 2910964310289565509,
-                          "lo": 10120401524168048460
+                          "hi": 8932425028074627537,
+                          "lo": 6932773600000067732
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.213.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.213.json
index 17a2b513..a37ff4b3 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.213.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.213.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4317620803568920190,
-                    "lo": 14990938741823032385
+                    "hi": 7508243416815340239,
+                    "lo": 5861524804672573736
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4317620803568920190,
-                    "lo": 14990938741823032385
+                    "hi": 7508243416815340239,
+                    "lo": 5861524804672573736
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4317620803568920190,
-                        "lo": 14990938741823032385
+                        "hi": 7508243416815340239,
+                        "lo": 5861524804672573736
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4317620803568920190,
-                            "lo": 14990938741823032385
+                            "hi": 7508243416815340239,
+                            "lo": 5861524804672573736
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4317620803568920190,
-                                  "lo": 14990938741823032385
+                                  "hi": 7508243416815340239,
+                                  "lo": 5861524804672573736
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4317620803568920190,
-                                  "lo": 14990938741823032385
+                                  "hi": 7508243416815340239,
+                                  "lo": 5861524804672573736
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4317620803568920190,
-                            "lo": 14990938741823032385
+                            "hi": 7508243416815340239,
+                            "lo": 5861524804672573736
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4317620803568920190,
-                            "lo": 14990938741823032385
+                            "hi": 7508243416815340239,
+                            "lo": 5861524804672573736
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 7508243416815340239,
+                            "lo": 5861524804672573736
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4317620803568920190,
-                          "lo": 14990938741823032385
+                          "hi": 7508243416815340239,
+                          "lo": 5861524804672573736
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.214.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.214.json
index 8b0402e0..81ff106e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.214.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.214.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7321385513355869927,
-                    "lo": 6202100587102036076
+                    "hi": 3787923556774354665,
+                    "lo": 10562459728848915785
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7321385513355869927,
-                    "lo": 6202100587102036076
+                    "hi": 3787923556774354665,
+                    "lo": 10562459728848915785
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 7321385513355869927,
-                        "lo": 6202100587102036076
+                        "hi": 3787923556774354665,
+                        "lo": 10562459728848915785
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7321385513355869927,
-                            "lo": 6202100587102036076
+                            "hi": 3787923556774354665,
+                            "lo": 10562459728848915785
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7321385513355869927,
-                                  "lo": 6202100587102036076
+                                  "hi": 3787923556774354665,
+                                  "lo": 10562459728848915785
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7321385513355869927,
-                                  "lo": 6202100587102036076
+                                  "hi": 3787923556774354665,
+                                  "lo": 10562459728848915785
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7321385513355869927,
-                            "lo": 6202100587102036076
+                            "hi": 3787923556774354665,
+                            "lo": 10562459728848915785
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7321385513355869927,
-                            "lo": 6202100587102036076
+                            "hi": 3787923556774354665,
+                            "lo": 10562459728848915785
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 3787923556774354665,
+                            "lo": 10562459728848915785
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 7321385513355869927,
-                          "lo": 6202100587102036076
+                          "hi": 3787923556774354665,
+                          "lo": 10562459728848915785
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.215.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.215.json
index baa39a2f..40ec188f 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.215.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.215.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7653492498189639224,
-                    "lo": 7970683460487224030
+                    "hi": 6178540233746314097,
+                    "lo": 13355768239366222643
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7653492498189639224,
-                    "lo": 7970683460487224030
+                    "hi": 6178540233746314097,
+                    "lo": 13355768239366222643
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 7653492498189639224,
-                        "lo": 7970683460487224030
+                        "hi": 6178540233746314097,
+                        "lo": 13355768239366222643
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7653492498189639224,
-                            "lo": 7970683460487224030
+                            "hi": 6178540233746314097,
+                            "lo": 13355768239366222643
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7653492498189639224,
-                                  "lo": 7970683460487224030
+                                  "hi": 6178540233746314097,
+                                  "lo": 13355768239366222643
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7653492498189639224,
-                                  "lo": 7970683460487224030
+                                  "hi": 6178540233746314097,
+                                  "lo": 13355768239366222643
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7653492498189639224,
-                            "lo": 7970683460487224030
+                            "hi": 6178540233746314097,
+                            "lo": 13355768239366222643
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7653492498189639224,
-                            "lo": 7970683460487224030
+                            "hi": 6178540233746314097,
+                            "lo": 13355768239366222643
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 6178540233746314097,
+                            "lo": 13355768239366222643
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 7653492498189639224,
-                          "lo": 7970683460487224030
+                          "hi": 6178540233746314097,
+                          "lo": 13355768239366222643
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.216.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.216.json
index 8ae7c78f..2d31e01b 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.216.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.216.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3772432300023388635,
-                    "lo": 7392154691656872066
+                    "hi": 1507332680395966612,
+                    "lo": 5410054648317428359
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3772432300023388635,
-                    "lo": 7392154691656872066
+                    "hi": 1507332680395966612,
+                    "lo": 5410054648317428359
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 3772432300023388635,
-                        "lo": 7392154691656872066
+                        "hi": 1507332680395966612,
+                        "lo": 5410054648317428359
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3772432300023388635,
-                            "lo": 7392154691656872066
+                            "hi": 1507332680395966612,
+                            "lo": 5410054648317428359
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3772432300023388635,
-                                  "lo": 7392154691656872066
+                                  "hi": 1507332680395966612,
+                                  "lo": 5410054648317428359
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3772432300023388635,
-                                  "lo": 7392154691656872066
+                                  "hi": 1507332680395966612,
+                                  "lo": 5410054648317428359
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3772432300023388635,
-                            "lo": 7392154691656872066
+                            "hi": 1507332680395966612,
+                            "lo": 5410054648317428359
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3772432300023388635,
-                            "lo": 7392154691656872066
+                            "hi": 1507332680395966612,
+                            "lo": 5410054648317428359
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 1507332680395966612,
+                            "lo": 5410054648317428359
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 3772432300023388635,
-                          "lo": 7392154691656872066
+                          "hi": 1507332680395966612,
+                          "lo": 5410054648317428359
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.217.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.217.json
index 33050c38..255668ea 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.217.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.217.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3918698405621171216,
-                    "lo": 9271411054354515665
+                    "hi": 662325396026387495,
+                    "lo": 11922387214163437468
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3918698405621171216,
-                    "lo": 9271411054354515665
+                    "hi": 662325396026387495,
+                    "lo": 11922387214163437468
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 3918698405621171216,
-                        "lo": 9271411054354515665
+                        "hi": 662325396026387495,
+                        "lo": 11922387214163437468
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3918698405621171216,
-                            "lo": 9271411054354515665
+                            "hi": 662325396026387495,
+                            "lo": 11922387214163437468
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3918698405621171216,
-                                  "lo": 9271411054354515665
+                                  "hi": 662325396026387495,
+                                  "lo": 11922387214163437468
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3918698405621171216,
-                                  "lo": 9271411054354515665
+                                  "hi": 662325396026387495,
+                                  "lo": 11922387214163437468
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3918698405621171216,
-                            "lo": 9271411054354515665
+                            "hi": 662325396026387495,
+                            "lo": 11922387214163437468
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3918698405621171216,
-                            "lo": 9271411054354515665
+                            "hi": 662325396026387495,
+                            "lo": 11922387214163437468
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 662325396026387495,
+                            "lo": 11922387214163437468
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 3918698405621171216,
-                          "lo": 9271411054354515665
+                          "hi": 662325396026387495,
+                          "lo": 11922387214163437468
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.218.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.218.json
index 02d80f59..cea9bb7b 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.218.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.218.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 567307951332389029,
-                    "lo": 12166250428145391866
+                    "hi": 6963287759773999983,
+                    "lo": 5492788958208258878
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 567307951332389029,
-                    "lo": 12166250428145391866
+                    "hi": 6963287759773999983,
+                    "lo": 5492788958208258878
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 567307951332389029,
-                        "lo": 12166250428145391866
+                        "hi": 6963287759773999983,
+                        "lo": 5492788958208258878
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 567307951332389029,
-                            "lo": 12166250428145391866
+                            "hi": 6963287759773999983,
+                            "lo": 5492788958208258878
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 567307951332389029,
-                                  "lo": 12166250428145391866
+                                  "hi": 6963287759773999983,
+                                  "lo": 5492788958208258878
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 567307951332389029,
-                                  "lo": 12166250428145391866
+                                  "hi": 6963287759773999983,
+                                  "lo": 5492788958208258878
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 567307951332389029,
-                            "lo": 12166250428145391866
+                            "hi": 6963287759773999983,
+                            "lo": 5492788958208258878
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 567307951332389029,
-                            "lo": 12166250428145391866
+                            "hi": 6963287759773999983,
+                            "lo": 5492788958208258878
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 6963287759773999983,
+                            "lo": 5492788958208258878
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 567307951332389029,
-                          "lo": 12166250428145391866
+                          "hi": 6963287759773999983,
+                          "lo": 5492788958208258878
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.219.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.219.json
index b4e635df..4fd3712f 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.219.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.219.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7472953766092614954,
-                    "lo": 13801726729028222572
+                    "hi": 6327412185631748244,
+                    "lo": 17684691344735510480
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7472953766092614954,
-                    "lo": 13801726729028222572
+                    "hi": 6327412185631748244,
+                    "lo": 17684691344735510480
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 7472953766092614954,
-                        "lo": 13801726729028222572
+                        "hi": 6327412185631748244,
+                        "lo": 17684691344735510480
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7472953766092614954,
-                            "lo": 13801726729028222572
+                            "hi": 6327412185631748244,
+                            "lo": 17684691344735510480
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7472953766092614954,
-                                  "lo": 13801726729028222572
+                                  "hi": 6327412185631748244,
+                                  "lo": 17684691344735510480
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7472953766092614954,
-                                  "lo": 13801726729028222572
+                                  "hi": 6327412185631748244,
+                                  "lo": 17684691344735510480
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7472953766092614954,
-                            "lo": 13801726729028222572
+                            "hi": 6327412185631748244,
+                            "lo": 17684691344735510480
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7472953766092614954,
-                            "lo": 13801726729028222572
+                            "hi": 6327412185631748244,
+                            "lo": 17684691344735510480
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 6327412185631748244,
+                            "lo": 17684691344735510480
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 7472953766092614954,
-                          "lo": 13801726729028222572
+                          "hi": 6327412185631748244,
+                          "lo": 17684691344735510480
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.22.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.22.json
index 9f008b28..1fb08970 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.22.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.22.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 223544154651452140,
-                    "lo": 10522835068590335982
+                    "hi": 8322239034055352575,
+                    "lo": 9667610026977500472
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 223544154651452140,
-                    "lo": 10522835068590335982
+                    "hi": 8322239034055352575,
+                    "lo": 9667610026977500472
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 223544154651452140,
-                        "lo": 10522835068590335982
+                        "hi": 8322239034055352575,
+                        "lo": 9667610026977500472
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 223544154651452140,
-                            "lo": 10522835068590335982
+                            "hi": 8322239034055352575,
+                            "lo": 9667610026977500472
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 223544154651452140,
-                                  "lo": 10522835068590335982
+                                  "hi": 8322239034055352575,
+                                  "lo": 9667610026977500472
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 223544154651452140,
-                                  "lo": 10522835068590335982
+                                  "hi": 8322239034055352575,
+                                  "lo": 9667610026977500472
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 223544154651452140,
-                            "lo": 10522835068590335982
+                            "hi": 8322239034055352575,
+                            "lo": 9667610026977500472
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 223544154651452140,
-                            "lo": 10522835068590335982
+                            "hi": 8322239034055352575,
+                            "lo": 9667610026977500472
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 8322239034055352575,
+                            "lo": 9667610026977500472
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 223544154651452140,
-                          "lo": 10522835068590335982
+                          "hi": 8322239034055352575,
+                          "lo": 9667610026977500472
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.220.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.220.json
index 8436b126..ca3398fc 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.220.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.220.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5526747817761550935,
-                    "lo": 16366918050217204770
+                    "hi": 3852850264593240143,
+                    "lo": 6416326886230753065
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5526747817761550935,
-                    "lo": 16366918050217204770
+                    "hi": 3852850264593240143,
+                    "lo": 6416326886230753065
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 5526747817761550935,
-                        "lo": 16366918050217204770
+                        "hi": 3852850264593240143,
+                        "lo": 6416326886230753065
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5526747817761550935,
-                            "lo": 16366918050217204770
+                            "hi": 3852850264593240143,
+                            "lo": 6416326886230753065
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5526747817761550935,
-                                  "lo": 16366918050217204770
+                                  "hi": 3852850264593240143,
+                                  "lo": 6416326886230753065
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5526747817761550935,
-                                  "lo": 16366918050217204770
+                                  "hi": 3852850264593240143,
+                                  "lo": 6416326886230753065
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5526747817761550935,
-                            "lo": 16366918050217204770
+                            "hi": 3852850264593240143,
+                            "lo": 6416326886230753065
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5526747817761550935,
-                            "lo": 16366918050217204770
+                            "hi": 3852850264593240143,
+                            "lo": 6416326886230753065
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 3852850264593240143,
+                            "lo": 6416326886230753065
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 5526747817761550935,
-                          "lo": 16366918050217204770
+                          "hi": 3852850264593240143,
+                          "lo": 6416326886230753065
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.221.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.221.json
index 35ec740c..4d8aa324 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.221.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.221.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7445892426471132871,
-                    "lo": 16430507200078364008
+                    "hi": 6004757676855814183,
+                    "lo": 8740444303297629165
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7445892426471132871,
-                    "lo": 16430507200078364008
+                    "hi": 6004757676855814183,
+                    "lo": 8740444303297629165
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 7445892426471132871,
-                        "lo": 16430507200078364008
+                        "hi": 6004757676855814183,
+                        "lo": 8740444303297629165
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7445892426471132871,
-                            "lo": 16430507200078364008
+                            "hi": 6004757676855814183,
+                            "lo": 8740444303297629165
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7445892426471132871,
-                                  "lo": 16430507200078364008
+                                  "hi": 6004757676855814183,
+                                  "lo": 8740444303297629165
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7445892426471132871,
-                                  "lo": 16430507200078364008
+                                  "hi": 6004757676855814183,
+                                  "lo": 8740444303297629165
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7445892426471132871,
-                            "lo": 16430507200078364008
+                            "hi": 6004757676855814183,
+                            "lo": 8740444303297629165
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7445892426471132871,
-                            "lo": 16430507200078364008
+                            "hi": 6004757676855814183,
+                            "lo": 8740444303297629165
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 6004757676855814183,
+                            "lo": 8740444303297629165
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 7445892426471132871,
-                          "lo": 16430507200078364008
+                          "hi": 6004757676855814183,
+                          "lo": 8740444303297629165
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.222.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.222.json
index e8131378..593f194a 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.222.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.222.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1895151912508688183,
-                    "lo": 14804990655662688879
+                    "hi": 9192747750392866479,
+                    "lo": 12158244698253782219
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1895151912508688183,
-                    "lo": 14804990655662688879
+                    "hi": 9192747750392866479,
+                    "lo": 12158244698253782219
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 1895151912508688183,
-                        "lo": 14804990655662688879
+                        "hi": 9192747750392866479,
+                        "lo": 12158244698253782219
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1895151912508688183,
-                            "lo": 14804990655662688879
+                            "hi": 9192747750392866479,
+                            "lo": 12158244698253782219
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 1895151912508688183,
-                                  "lo": 14804990655662688879
+                                  "hi": 9192747750392866479,
+                                  "lo": 12158244698253782219
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 1895151912508688183,
-                                  "lo": 14804990655662688879
+                                  "hi": 9192747750392866479,
+                                  "lo": 12158244698253782219
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1895151912508688183,
-                            "lo": 14804990655662688879
+                            "hi": 9192747750392866479,
+                            "lo": 12158244698253782219
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1895151912508688183,
-                            "lo": 14804990655662688879
+                            "hi": 9192747750392866479,
+                            "lo": 12158244698253782219
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 9192747750392866479,
+                            "lo": 12158244698253782219
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 1895151912508688183,
-                          "lo": 14804990655662688879
+                          "hi": 9192747750392866479,
+                          "lo": 12158244698253782219
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.223.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.223.json
index a343915f..1f0d15be 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.223.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.223.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6975001747763028794,
-                    "lo": 12198473281838615997
+                    "hi": 4368059470346448793,
+                    "lo": 18331487531603733082
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6975001747763028794,
-                    "lo": 12198473281838615997
+                    "hi": 4368059470346448793,
+                    "lo": 18331487531603733082
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 6975001747763028794,
-                        "lo": 12198473281838615997
+                        "hi": 4368059470346448793,
+                        "lo": 18331487531603733082
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6975001747763028794,
-                            "lo": 12198473281838615997
+                            "hi": 4368059470346448793,
+                            "lo": 18331487531603733082
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6975001747763028794,
-                                  "lo": 12198473281838615997
+                                  "hi": 4368059470346448793,
+                                  "lo": 18331487531603733082
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6975001747763028794,
-                                  "lo": 12198473281838615997
+                                  "hi": 4368059470346448793,
+                                  "lo": 18331487531603733082
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6975001747763028794,
-                            "lo": 12198473281838615997
+                            "hi": 4368059470346448793,
+                            "lo": 18331487531603733082
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6975001747763028794,
-                            "lo": 12198473281838615997
+                            "hi": 4368059470346448793,
+                            "lo": 18331487531603733082
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 4368059470346448793,
+                            "lo": 18331487531603733082
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 6975001747763028794,
-                          "lo": 12198473281838615997
+                          "hi": 4368059470346448793,
+                          "lo": 18331487531603733082
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.224.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.224.json
index 5abf0214..510733e5 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.224.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.224.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3112811808818091060,
-                    "lo": 16257626206206877607
+                    "hi": 111888372626074423,
+                    "lo": 13623249725246178103
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3112811808818091060,
-                    "lo": 16257626206206877607
+                    "hi": 111888372626074423,
+                    "lo": 13623249725246178103
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 3112811808818091060,
-                        "lo": 16257626206206877607
+                        "hi": 111888372626074423,
+                        "lo": 13623249725246178103
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3112811808818091060,
-                            "lo": 16257626206206877607
+                            "hi": 111888372626074423,
+                            "lo": 13623249725246178103
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3112811808818091060,
-                                  "lo": 16257626206206877607
+                                  "hi": 111888372626074423,
+                                  "lo": 13623249725246178103
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3112811808818091060,
-                                  "lo": 16257626206206877607
+                                  "hi": 111888372626074423,
+                                  "lo": 13623249725246178103
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3112811808818091060,
-                            "lo": 16257626206206877607
+                            "hi": 111888372626074423,
+                            "lo": 13623249725246178103
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3112811808818091060,
-                            "lo": 16257626206206877607
+                            "hi": 111888372626074423,
+                            "lo": 13623249725246178103
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 111888372626074423,
+                            "lo": 13623249725246178103
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 3112811808818091060,
-                          "lo": 16257626206206877607
+                          "hi": 111888372626074423,
+                          "lo": 13623249725246178103
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.225.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.225.json
index 4795b8c4..da15554c 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.225.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.225.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4856420047365901292,
-                    "lo": 2324209137784171489
+                    "hi": 3384857506788330285,
+                    "lo": 2950610080397044285
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4856420047365901292,
-                    "lo": 2324209137784171489
+                    "hi": 3384857506788330285,
+                    "lo": 2950610080397044285
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4856420047365901292,
-                        "lo": 2324209137784171489
+                        "hi": 3384857506788330285,
+                        "lo": 2950610080397044285
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4856420047365901292,
-                            "lo": 2324209137784171489
+                            "hi": 3384857506788330285,
+                            "lo": 2950610080397044285
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4856420047365901292,
-                                  "lo": 2324209137784171489
+                                  "hi": 3384857506788330285,
+                                  "lo": 2950610080397044285
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4856420047365901292,
-                                  "lo": 2324209137784171489
+                                  "hi": 3384857506788330285,
+                                  "lo": 2950610080397044285
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4856420047365901292,
-                            "lo": 2324209137784171489
+                            "hi": 3384857506788330285,
+                            "lo": 2950610080397044285
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4856420047365901292,
-                            "lo": 2324209137784171489
+                            "hi": 3384857506788330285,
+                            "lo": 2950610080397044285
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 3384857506788330285,
+                            "lo": 2950610080397044285
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4856420047365901292,
-                          "lo": 2324209137784171489
+                          "hi": 3384857506788330285,
+                          "lo": 2950610080397044285
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.226.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.226.json
index 84eb6ed4..a4e848db 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.226.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.226.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8031876962845162970,
-                    "lo": 8468339154028428629
+                    "hi": 8323263611772848206,
+                    "lo": 2193722533547928521
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8031876962845162970,
-                    "lo": 8468339154028428629
+                    "hi": 8323263611772848206,
+                    "lo": 2193722533547928521
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 8031876962845162970,
-                        "lo": 8468339154028428629
+                        "hi": 8323263611772848206,
+                        "lo": 2193722533547928521
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8031876962845162970,
-                            "lo": 8468339154028428629
+                            "hi": 8323263611772848206,
+                            "lo": 2193722533547928521
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8031876962845162970,
-                                  "lo": 8468339154028428629
+                                  "hi": 8323263611772848206,
+                                  "lo": 2193722533547928521
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8031876962845162970,
-                                  "lo": 8468339154028428629
+                                  "hi": 8323263611772848206,
+                                  "lo": 2193722533547928521
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8031876962845162970,
-                            "lo": 8468339154028428629
+                            "hi": 8323263611772848206,
+                            "lo": 2193722533547928521
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8031876962845162970,
-                            "lo": 8468339154028428629
+                            "hi": 8323263611772848206,
+                            "lo": 2193722533547928521
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 8323263611772848206,
+                            "lo": 2193722533547928521
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 8031876962845162970,
-                          "lo": 8468339154028428629
+                          "hi": 8323263611772848206,
+                          "lo": 2193722533547928521
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.227.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.227.json
index 3e4ae37e..81c3a8e5 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.227.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.227.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 32680285092943854,
-                    "lo": 3917046763427331731
+                    "hi": 6795744487345593000,
+                    "lo": 10927300926780003765
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 32680285092943854,
-                    "lo": 3917046763427331731
+                    "hi": 6795744487345593000,
+                    "lo": 10927300926780003765
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 32680285092943854,
-                        "lo": 3917046763427331731
+                        "hi": 6795744487345593000,
+                        "lo": 10927300926780003765
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 32680285092943854,
-                            "lo": 3917046763427331731
+                            "hi": 6795744487345593000,
+                            "lo": 10927300926780003765
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 32680285092943854,
-                                  "lo": 3917046763427331731
+                                  "hi": 6795744487345593000,
+                                  "lo": 10927300926780003765
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 32680285092943854,
-                                  "lo": 3917046763427331731
+                                  "hi": 6795744487345593000,
+                                  "lo": 10927300926780003765
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 32680285092943854,
-                            "lo": 3917046763427331731
+                            "hi": 6795744487345593000,
+                            "lo": 10927300926780003765
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 32680285092943854,
-                            "lo": 3917046763427331731
+                            "hi": 6795744487345593000,
+                            "lo": 10927300926780003765
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 6795744487345593000,
+                            "lo": 10927300926780003765
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 32680285092943854,
-                          "lo": 3917046763427331731
+                          "hi": 6795744487345593000,
+                          "lo": 10927300926780003765
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.228.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.228.json
index b7661492..e2aab73a 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.228.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.228.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8137253862349404884,
-                    "lo": 3362458473417394013
+                    "hi": 8573278741021076820,
+                    "lo": 8548937061212071128
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8137253862349404884,
-                    "lo": 3362458473417394013
+                    "hi": 8573278741021076820,
+                    "lo": 8548937061212071128
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 8137253862349404884,
-                        "lo": 3362458473417394013
+                        "hi": 8573278741021076820,
+                        "lo": 8548937061212071128
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8137253862349404884,
-                            "lo": 3362458473417394013
+                            "hi": 8573278741021076820,
+                            "lo": 8548937061212071128
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8137253862349404884,
-                                  "lo": 3362458473417394013
+                                  "hi": 8573278741021076820,
+                                  "lo": 8548937061212071128
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8137253862349404884,
-                                  "lo": 3362458473417394013
+                                  "hi": 8573278741021076820,
+                                  "lo": 8548937061212071128
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8137253862349404884,
-                            "lo": 3362458473417394013
+                            "hi": 8573278741021076820,
+                            "lo": 8548937061212071128
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8137253862349404884,
-                            "lo": 3362458473417394013
+                            "hi": 8573278741021076820,
+                            "lo": 8548937061212071128
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 8573278741021076820,
+                            "lo": 8548937061212071128
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 8137253862349404884,
-                          "lo": 3362458473417394013
+                          "hi": 8573278741021076820,
+                          "lo": 8548937061212071128
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.229.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.229.json
index a90f7bac..256de846 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.229.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.229.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1509834600955679879,
-                    "lo": 3005713849217245777
+                    "hi": 1875701170273935274,
+                    "lo": 14050059050745926253
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1509834600955679879,
-                    "lo": 3005713849217245777
+                    "hi": 1875701170273935274,
+                    "lo": 14050059050745926253
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 1509834600955679879,
-                        "lo": 3005713849217245777
+                        "hi": 1875701170273935274,
+                        "lo": 14050059050745926253
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1509834600955679879,
-                            "lo": 3005713849217245777
+                            "hi": 1875701170273935274,
+                            "lo": 14050059050745926253
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 1509834600955679879,
-                                  "lo": 3005713849217245777
+                                  "hi": 1875701170273935274,
+                                  "lo": 14050059050745926253
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 1509834600955679879,
-                                  "lo": 3005713849217245777
+                                  "hi": 1875701170273935274,
+                                  "lo": 14050059050745926253
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1509834600955679879,
-                            "lo": 3005713849217245777
+                            "hi": 1875701170273935274,
+                            "lo": 14050059050745926253
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1509834600955679879,
-                            "lo": 3005713849217245777
+                            "hi": 1875701170273935274,
+                            "lo": 14050059050745926253
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 1875701170273935274,
+                            "lo": 14050059050745926253
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 1509834600955679879,
-                          "lo": 3005713849217245777
+                          "hi": 1875701170273935274,
+                          "lo": 14050059050745926253
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.23.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.23.json
index f59b1c04..1f94e325 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.23.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.23.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2515351673498589599,
-                    "lo": 11411799923295708573
+                    "hi": 6762477369102438576,
+                    "lo": 15051045719386770374
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2515351673498589599,
-                    "lo": 11411799923295708573
+                    "hi": 6762477369102438576,
+                    "lo": 15051045719386770374
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 2515351673498589599,
-                        "lo": 11411799923295708573
+                        "hi": 6762477369102438576,
+                        "lo": 15051045719386770374
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2515351673498589599,
-                            "lo": 11411799923295708573
+                            "hi": 6762477369102438576,
+                            "lo": 15051045719386770374
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2515351673498589599,
-                                  "lo": 11411799923295708573
+                                  "hi": 6762477369102438576,
+                                  "lo": 15051045719386770374
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2515351673498589599,
-                                  "lo": 11411799923295708573
+                                  "hi": 6762477369102438576,
+                                  "lo": 15051045719386770374
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2515351673498589599,
-                            "lo": 11411799923295708573
+                            "hi": 6762477369102438576,
+                            "lo": 15051045719386770374
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2515351673498589599,
-                            "lo": 11411799923295708573
+                            "hi": 6762477369102438576,
+                            "lo": 15051045719386770374
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 6762477369102438576,
+                            "lo": 15051045719386770374
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 2515351673498589599,
-                          "lo": 11411799923295708573
+                          "hi": 6762477369102438576,
+                          "lo": 15051045719386770374
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.230.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.230.json
index b946068b..5f5fe12d 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.230.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.230.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5216901392994372560,
-                    "lo": 767532966342508171
+                    "hi": 8149689761539405691,
+                    "lo": 1610922000660722198
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5216901392994372560,
-                    "lo": 767532966342508171
+                    "hi": 8149689761539405691,
+                    "lo": 1610922000660722198
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 5216901392994372560,
-                        "lo": 767532966342508171
+                        "hi": 8149689761539405691,
+                        "lo": 1610922000660722198
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5216901392994372560,
-                            "lo": 767532966342508171
+                            "hi": 8149689761539405691,
+                            "lo": 1610922000660722198
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5216901392994372560,
-                                  "lo": 767532966342508171
+                                  "hi": 8149689761539405691,
+                                  "lo": 1610922000660722198
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5216901392994372560,
-                                  "lo": 767532966342508171
+                                  "hi": 8149689761539405691,
+                                  "lo": 1610922000660722198
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5216901392994372560,
-                            "lo": 767532966342508171
+                            "hi": 8149689761539405691,
+                            "lo": 1610922000660722198
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5216901392994372560,
-                            "lo": 767532966342508171
+                            "hi": 8149689761539405691,
+                            "lo": 1610922000660722198
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 8149689761539405691,
+                            "lo": 1610922000660722198
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 5216901392994372560,
-                          "lo": 767532966342508171
+                          "hi": 8149689761539405691,
+                          "lo": 1610922000660722198
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.231.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.231.json
index 29c32223..f4a63561 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.231.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.231.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3130443676504120582,
-                    "lo": 12626778160641220659
+                    "hi": 8999148651134238288,
+                    "lo": 17583494258991831030
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3130443676504120582,
-                    "lo": 12626778160641220659
+                    "hi": 8999148651134238288,
+                    "lo": 17583494258991831030
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 3130443676504120582,
-                        "lo": 12626778160641220659
+                        "hi": 8999148651134238288,
+                        "lo": 17583494258991831030
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3130443676504120582,
-                            "lo": 12626778160641220659
+                            "hi": 8999148651134238288,
+                            "lo": 17583494258991831030
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3130443676504120582,
-                                  "lo": 12626778160641220659
+                                  "hi": 8999148651134238288,
+                                  "lo": 17583494258991831030
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3130443676504120582,
-                                  "lo": 12626778160641220659
+                                  "hi": 8999148651134238288,
+                                  "lo": 17583494258991831030
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3130443676504120582,
-                            "lo": 12626778160641220659
+                            "hi": 8999148651134238288,
+                            "lo": 17583494258991831030
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3130443676504120582,
-                            "lo": 12626778160641220659
+                            "hi": 8999148651134238288,
+                            "lo": 17583494258991831030
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 8999148651134238288,
+                            "lo": 17583494258991831030
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 3130443676504120582,
-                          "lo": 12626778160641220659
+                          "hi": 8999148651134238288,
+                          "lo": 17583494258991831030
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.232.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.232.json
index 2b0e2da1..e80cc66e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.232.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.232.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2154346047941122522,
-                    "lo": 12224768442822545908
+                    "hi": 5907058936502336041,
+                    "lo": 8740175830721116406
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2154346047941122522,
-                    "lo": 12224768442822545908
+                    "hi": 5907058936502336041,
+                    "lo": 8740175830721116406
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 2154346047941122522,
-                        "lo": 12224768442822545908
+                        "hi": 5907058936502336041,
+                        "lo": 8740175830721116406
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2154346047941122522,
-                            "lo": 12224768442822545908
+                            "hi": 5907058936502336041,
+                            "lo": 8740175830721116406
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2154346047941122522,
-                                  "lo": 12224768442822545908
+                                  "hi": 5907058936502336041,
+                                  "lo": 8740175830721116406
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2154346047941122522,
-                                  "lo": 12224768442822545908
+                                  "hi": 5907058936502336041,
+                                  "lo": 8740175830721116406
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2154346047941122522,
-                            "lo": 12224768442822545908
+                            "hi": 5907058936502336041,
+                            "lo": 8740175830721116406
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2154346047941122522,
-                            "lo": 12224768442822545908
+                            "hi": 5907058936502336041,
+                            "lo": 8740175830721116406
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 5907058936502336041,
+                            "lo": 8740175830721116406
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 2154346047941122522,
-                          "lo": 12224768442822545908
+                          "hi": 5907058936502336041,
+                          "lo": 8740175830721116406
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.233.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.233.json
index e6685832..8050f5db 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.233.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.233.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7895161450427823217,
-                    "lo": 657853087719960027
+                    "hi": 5755393384195027375,
+                    "lo": 13581660266627825946
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7895161450427823217,
-                    "lo": 657853087719960027
+                    "hi": 5755393384195027375,
+                    "lo": 13581660266627825946
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 7895161450427823217,
-                        "lo": 657853087719960027
+                        "hi": 5755393384195027375,
+                        "lo": 13581660266627825946
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7895161450427823217,
-                            "lo": 657853087719960027
+                            "hi": 5755393384195027375,
+                            "lo": 13581660266627825946
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7895161450427823217,
-                                  "lo": 657853087719960027
+                                  "hi": 5755393384195027375,
+                                  "lo": 13581660266627825946
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7895161450427823217,
-                                  "lo": 657853087719960027
+                                  "hi": 5755393384195027375,
+                                  "lo": 13581660266627825946
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7895161450427823217,
-                            "lo": 657853087719960027
+                            "hi": 5755393384195027375,
+                            "lo": 13581660266627825946
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7895161450427823217,
-                            "lo": 657853087719960027
+                            "hi": 5755393384195027375,
+                            "lo": 13581660266627825946
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 5755393384195027375,
+                            "lo": 13581660266627825946
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 7895161450427823217,
-                          "lo": 657853087719960027
+                          "hi": 5755393384195027375,
+                          "lo": 13581660266627825946
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.234.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.234.json
index f40bc025..75483791 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.234.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.234.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2917071072540492347,
-                    "lo": 11943000820715485106
+                    "hi": 5368697010953362648,
+                    "lo": 3221740811127483888
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2917071072540492347,
-                    "lo": 11943000820715485106
+                    "hi": 5368697010953362648,
+                    "lo": 3221740811127483888
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 2917071072540492347,
-                        "lo": 11943000820715485106
+                        "hi": 5368697010953362648,
+                        "lo": 3221740811127483888
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2917071072540492347,
-                            "lo": 11943000820715485106
+                            "hi": 5368697010953362648,
+                            "lo": 3221740811127483888
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2917071072540492347,
-                                  "lo": 11943000820715485106
+                                  "hi": 5368697010953362648,
+                                  "lo": 3221740811127483888
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2917071072540492347,
-                                  "lo": 11943000820715485106
+                                  "hi": 5368697010953362648,
+                                  "lo": 3221740811127483888
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2917071072540492347,
-                            "lo": 11943000820715485106
+                            "hi": 5368697010953362648,
+                            "lo": 3221740811127483888
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2917071072540492347,
-                            "lo": 11943000820715485106
+                            "hi": 5368697010953362648,
+                            "lo": 3221740811127483888
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 5368697010953362648,
+                            "lo": 3221740811127483888
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 2917071072540492347,
-                          "lo": 11943000820715485106
+                          "hi": 5368697010953362648,
+                          "lo": 3221740811127483888
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.235.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.235.json
index fa7d7d16..2245ad39 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.235.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.235.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5715315567726064627,
-                    "lo": 17326736169531616560
+                    "hi": 7411829413356169098,
+                    "lo": 12769426031569983464
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5715315567726064627,
-                    "lo": 17326736169531616560
+                    "hi": 7411829413356169098,
+                    "lo": 12769426031569983464
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 5715315567726064627,
-                        "lo": 17326736169531616560
+                        "hi": 7411829413356169098,
+                        "lo": 12769426031569983464
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5715315567726064627,
-                            "lo": 17326736169531616560
+                            "hi": 7411829413356169098,
+                            "lo": 12769426031569983464
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5715315567726064627,
-                                  "lo": 17326736169531616560
+                                  "hi": 7411829413356169098,
+                                  "lo": 12769426031569983464
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5715315567726064627,
-                                  "lo": 17326736169531616560
+                                  "hi": 7411829413356169098,
+                                  "lo": 12769426031569983464
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5715315567726064627,
-                            "lo": 17326736169531616560
+                            "hi": 7411829413356169098,
+                            "lo": 12769426031569983464
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5715315567726064627,
-                            "lo": 17326736169531616560
+                            "hi": 7411829413356169098,
+                            "lo": 12769426031569983464
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 7411829413356169098,
+                            "lo": 12769426031569983464
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 5715315567726064627,
-                          "lo": 17326736169531616560
+                          "hi": 7411829413356169098,
+                          "lo": 12769426031569983464
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.236.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.236.json
index 9e9ac655..89dfcfa8 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.236.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.236.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 9123725526128721717,
-                    "lo": 2174246130504685680
+                    "hi": 8943655400801115671,
+                    "lo": 8352992165665089774
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 9123725526128721717,
-                    "lo": 2174246130504685680
+                    "hi": 8943655400801115671,
+                    "lo": 8352992165665089774
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 9123725526128721717,
-                        "lo": 2174246130504685680
+                        "hi": 8943655400801115671,
+                        "lo": 8352992165665089774
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 9123725526128721717,
-                            "lo": 2174246130504685680
+                            "hi": 8943655400801115671,
+                            "lo": 8352992165665089774
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 9123725526128721717,
-                                  "lo": 2174246130504685680
+                                  "hi": 8943655400801115671,
+                                  "lo": 8352992165665089774
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 9123725526128721717,
-                                  "lo": 2174246130504685680
+                                  "hi": 8943655400801115671,
+                                  "lo": 8352992165665089774
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 9123725526128721717,
-                            "lo": 2174246130504685680
+                            "hi": 8943655400801115671,
+                            "lo": 8352992165665089774
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 9123725526128721717,
-                            "lo": 2174246130504685680
+                            "hi": 8943655400801115671,
+                            "lo": 8352992165665089774
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 8943655400801115671,
+                            "lo": 8352992165665089774
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 9123725526128721717,
-                          "lo": 2174246130504685680
+                          "hi": 8943655400801115671,
+                          "lo": 8352992165665089774
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.237.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.237.json
index bedac44f..b39b00b8 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.237.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.237.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3823753593486894610,
-                    "lo": 5486761638157925874
+                    "hi": 722672591741087983,
+                    "lo": 4969245197679611100
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3823753593486894610,
-                    "lo": 5486761638157925874
+                    "hi": 722672591741087983,
+                    "lo": 4969245197679611100
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 3823753593486894610,
-                        "lo": 5486761638157925874
+                        "hi": 722672591741087983,
+                        "lo": 4969245197679611100
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3823753593486894610,
-                            "lo": 5486761638157925874
+                            "hi": 722672591741087983,
+                            "lo": 4969245197679611100
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3823753593486894610,
-                                  "lo": 5486761638157925874
+                                  "hi": 722672591741087983,
+                                  "lo": 4969245197679611100
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3823753593486894610,
-                                  "lo": 5486761638157925874
+                                  "hi": 722672591741087983,
+                                  "lo": 4969245197679611100
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3823753593486894610,
-                            "lo": 5486761638157925874
+                            "hi": 722672591741087983,
+                            "lo": 4969245197679611100
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3823753593486894610,
-                            "lo": 5486761638157925874
+                            "hi": 722672591741087983,
+                            "lo": 4969245197679611100
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 722672591741087983,
+                            "lo": 4969245197679611100
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 3823753593486894610,
-                          "lo": 5486761638157925874
+                          "hi": 722672591741087983,
+                          "lo": 4969245197679611100
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.238.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.238.json
index e53ec002..e25fee58 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.238.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.238.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4663654036005628154,
-                    "lo": 2805521741126362237
+                    "hi": 1289794791053711746,
+                    "lo": 4581485452436169610
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4663654036005628154,
-                    "lo": 2805521741126362237
+                    "hi": 1289794791053711746,
+                    "lo": 4581485452436169610
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4663654036005628154,
-                        "lo": 2805521741126362237
+                        "hi": 1289794791053711746,
+                        "lo": 4581485452436169610
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4663654036005628154,
-                            "lo": 2805521741126362237
+                            "hi": 1289794791053711746,
+                            "lo": 4581485452436169610
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4663654036005628154,
-                                  "lo": 2805521741126362237
+                                  "hi": 1289794791053711746,
+                                  "lo": 4581485452436169610
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4663654036005628154,
-                                  "lo": 2805521741126362237
+                                  "hi": 1289794791053711746,
+                                  "lo": 4581485452436169610
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4663654036005628154,
-                            "lo": 2805521741126362237
+                            "hi": 1289794791053711746,
+                            "lo": 4581485452436169610
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4663654036005628154,
-                            "lo": 2805521741126362237
+                            "hi": 1289794791053711746,
+                            "lo": 4581485452436169610
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 1289794791053711746,
+                            "lo": 4581485452436169610
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4663654036005628154,
-                          "lo": 2805521741126362237
+                          "hi": 1289794791053711746,
+                          "lo": 4581485452436169610
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.239.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.239.json
index 154e74ff..905635d6 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.239.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.239.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4161667742634956542,
-                    "lo": 7366068309454380264
+                    "hi": 8784283784794187068,
+                    "lo": 14724019959819049034
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4161667742634956542,
-                    "lo": 7366068309454380264
+                    "hi": 8784283784794187068,
+                    "lo": 14724019959819049034
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4161667742634956542,
-                        "lo": 7366068309454380264
+                        "hi": 8784283784794187068,
+                        "lo": 14724019959819049034
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4161667742634956542,
-                            "lo": 7366068309454380264
+                            "hi": 8784283784794187068,
+                            "lo": 14724019959819049034
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4161667742634956542,
-                                  "lo": 7366068309454380264
+                                  "hi": 8784283784794187068,
+                                  "lo": 14724019959819049034
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4161667742634956542,
-                                  "lo": 7366068309454380264
+                                  "hi": 8784283784794187068,
+                                  "lo": 14724019959819049034
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4161667742634956542,
-                            "lo": 7366068309454380264
+                            "hi": 8784283784794187068,
+                            "lo": 14724019959819049034
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4161667742634956542,
-                            "lo": 7366068309454380264
+                            "hi": 8784283784794187068,
+                            "lo": 14724019959819049034
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 8784283784794187068,
+                            "lo": 14724019959819049034
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4161667742634956542,
-                          "lo": 7366068309454380264
+                          "hi": 8784283784794187068,
+                          "lo": 14724019959819049034
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.24.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.24.json
index beb4b5ee..bbccc495 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.24.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.24.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8539822928466402416,
-                    "lo": 1120544671147884616
+                    "hi": 9124644132717042681,
+                    "lo": 11603591263336710528
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8539822928466402416,
-                    "lo": 1120544671147884616
+                    "hi": 9124644132717042681,
+                    "lo": 11603591263336710528
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 8539822928466402416,
-                        "lo": 1120544671147884616
+                        "hi": 9124644132717042681,
+                        "lo": 11603591263336710528
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8539822928466402416,
-                            "lo": 1120544671147884616
+                            "hi": 9124644132717042681,
+                            "lo": 11603591263336710528
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8539822928466402416,
-                                  "lo": 1120544671147884616
+                                  "hi": 9124644132717042681,
+                                  "lo": 11603591263336710528
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8539822928466402416,
-                                  "lo": 1120544671147884616
+                                  "hi": 9124644132717042681,
+                                  "lo": 11603591263336710528
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8539822928466402416,
-                            "lo": 1120544671147884616
+                            "hi": 9124644132717042681,
+                            "lo": 11603591263336710528
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8539822928466402416,
-                            "lo": 1120544671147884616
+                            "hi": 9124644132717042681,
+                            "lo": 11603591263336710528
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 9124644132717042681,
+                            "lo": 11603591263336710528
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 8539822928466402416,
-                          "lo": 1120544671147884616
+                          "hi": 9124644132717042681,
+                          "lo": 11603591263336710528
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.240.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.240.json
index 89495c6f..d5f3296b 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.240.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.240.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6934963330469645974,
-                    "lo": 17338857380964516076
+                    "hi": 4800748920421289292,
+                    "lo": 13806144162167614666
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6934963330469645974,
-                    "lo": 17338857380964516076
+                    "hi": 4800748920421289292,
+                    "lo": 13806144162167614666
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 6934963330469645974,
-                        "lo": 17338857380964516076
+                        "hi": 4800748920421289292,
+                        "lo": 13806144162167614666
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6934963330469645974,
-                            "lo": 17338857380964516076
+                            "hi": 4800748920421289292,
+                            "lo": 13806144162167614666
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6934963330469645974,
-                                  "lo": 17338857380964516076
+                                  "hi": 4800748920421289292,
+                                  "lo": 13806144162167614666
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6934963330469645974,
-                                  "lo": 17338857380964516076
+                                  "hi": 4800748920421289292,
+                                  "lo": 13806144162167614666
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6934963330469645974,
-                            "lo": 17338857380964516076
+                            "hi": 4800748920421289292,
+                            "lo": 13806144162167614666
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6934963330469645974,
-                            "lo": 17338857380964516076
+                            "hi": 4800748920421289292,
+                            "lo": 13806144162167614666
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 4800748920421289292,
+                            "lo": 13806144162167614666
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 6934963330469645974,
-                          "lo": 17338857380964516076
+                          "hi": 4800748920421289292,
+                          "lo": 13806144162167614666
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.241.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.241.json
index 75be119a..1fed1872 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.241.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.241.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8912913226066220694,
-                    "lo": 9462964553006101325
+                    "hi": 91443528815108083,
+                    "lo": 1504561467961653988
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8912913226066220694,
-                    "lo": 9462964553006101325
+                    "hi": 91443528815108083,
+                    "lo": 1504561467961653988
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 8912913226066220694,
-                        "lo": 9462964553006101325
+                        "hi": 91443528815108083,
+                        "lo": 1504561467961653988
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8912913226066220694,
-                            "lo": 9462964553006101325
+                            "hi": 91443528815108083,
+                            "lo": 1504561467961653988
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8912913226066220694,
-                                  "lo": 9462964553006101325
+                                  "hi": 91443528815108083,
+                                  "lo": 1504561467961653988
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8912913226066220694,
-                                  "lo": 9462964553006101325
+                                  "hi": 91443528815108083,
+                                  "lo": 1504561467961653988
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8912913226066220694,
-                            "lo": 9462964553006101325
+                            "hi": 91443528815108083,
+                            "lo": 1504561467961653988
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8912913226066220694,
-                            "lo": 9462964553006101325
+                            "hi": 91443528815108083,
+                            "lo": 1504561467961653988
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 91443528815108083,
+                            "lo": 1504561467961653988
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 8912913226066220694,
-                          "lo": 9462964553006101325
+                          "hi": 91443528815108083,
+                          "lo": 1504561467961653988
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.242.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.242.json
index b2e332e5..aa5bc8fc 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.242.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.242.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2042186188262511829,
-                    "lo": 5113525561428756141
+                    "hi": 2058347209747191102,
+                    "lo": 15036066369355530581
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2042186188262511829,
-                    "lo": 5113525561428756141
+                    "hi": 2058347209747191102,
+                    "lo": 15036066369355530581
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 2042186188262511829,
-                        "lo": 5113525561428756141
+                        "hi": 2058347209747191102,
+                        "lo": 15036066369355530581
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2042186188262511829,
-                            "lo": 5113525561428756141
+                            "hi": 2058347209747191102,
+                            "lo": 15036066369355530581
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2042186188262511829,
-                                  "lo": 5113525561428756141
+                                  "hi": 2058347209747191102,
+                                  "lo": 15036066369355530581
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2042186188262511829,
-                                  "lo": 5113525561428756141
+                                  "hi": 2058347209747191102,
+                                  "lo": 15036066369355530581
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2042186188262511829,
-                            "lo": 5113525561428756141
+                            "hi": 2058347209747191102,
+                            "lo": 15036066369355530581
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2042186188262511829,
-                            "lo": 5113525561428756141
+                            "hi": 2058347209747191102,
+                            "lo": 15036066369355530581
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 2058347209747191102,
+                            "lo": 15036066369355530581
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 2042186188262511829,
-                          "lo": 5113525561428756141
+                          "hi": 2058347209747191102,
+                          "lo": 15036066369355530581
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.243.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.243.json
index a70dba05..214764e8 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.243.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.243.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5296274594709299302,
-                    "lo": 14049599300294297150
+                    "hi": 16842557001202091,
+                    "lo": 12559971548340901182
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5296274594709299302,
-                    "lo": 14049599300294297150
+                    "hi": 16842557001202091,
+                    "lo": 12559971548340901182
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 5296274594709299302,
-                        "lo": 14049599300294297150
+                        "hi": 16842557001202091,
+                        "lo": 12559971548340901182
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5296274594709299302,
-                            "lo": 14049599300294297150
+                            "hi": 16842557001202091,
+                            "lo": 12559971548340901182
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5296274594709299302,
-                                  "lo": 14049599300294297150
+                                  "hi": 16842557001202091,
+                                  "lo": 12559971548340901182
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5296274594709299302,
-                                  "lo": 14049599300294297150
+                                  "hi": 16842557001202091,
+                                  "lo": 12559971548340901182
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5296274594709299302,
-                            "lo": 14049599300294297150
+                            "hi": 16842557001202091,
+                            "lo": 12559971548340901182
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5296274594709299302,
-                            "lo": 14049599300294297150
+                            "hi": 16842557001202091,
+                            "lo": 12559971548340901182
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 16842557001202091,
+                            "lo": 12559971548340901182
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 5296274594709299302,
-                          "lo": 14049599300294297150
+                          "hi": 16842557001202091,
+                          "lo": 12559971548340901182
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.244.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.244.json
index 2c9ca0e6..dc8c2f68 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.244.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.244.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2392664781486021710,
-                    "lo": 4534609336536983234
+                    "hi": 2841035666532952419,
+                    "lo": 11749062760301934558
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2392664781486021710,
-                    "lo": 4534609336536983234
+                    "hi": 2841035666532952419,
+                    "lo": 11749062760301934558
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 2392664781486021710,
-                        "lo": 4534609336536983234
+                        "hi": 2841035666532952419,
+                        "lo": 11749062760301934558
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2392664781486021710,
-                            "lo": 4534609336536983234
+                            "hi": 2841035666532952419,
+                            "lo": 11749062760301934558
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2392664781486021710,
-                                  "lo": 4534609336536983234
+                                  "hi": 2841035666532952419,
+                                  "lo": 11749062760301934558
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2392664781486021710,
-                                  "lo": 4534609336536983234
+                                  "hi": 2841035666532952419,
+                                  "lo": 11749062760301934558
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2392664781486021710,
-                            "lo": 4534609336536983234
+                            "hi": 2841035666532952419,
+                            "lo": 11749062760301934558
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2392664781486021710,
-                            "lo": 4534609336536983234
+                            "hi": 2841035666532952419,
+                            "lo": 11749062760301934558
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 2841035666532952419,
+                            "lo": 11749062760301934558
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 2392664781486021710,
-                          "lo": 4534609336536983234
+                          "hi": 2841035666532952419,
+                          "lo": 11749062760301934558
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.245.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.245.json
index 470bf2ed..4613ff89 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.245.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.245.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3457062230836051077,
-                    "lo": 12921821251131138052
+                    "hi": 7425660765689468259,
+                    "lo": 14387190051538210308
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3457062230836051077,
-                    "lo": 12921821251131138052
+                    "hi": 7425660765689468259,
+                    "lo": 14387190051538210308
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 3457062230836051077,
-                        "lo": 12921821251131138052
+                        "hi": 7425660765689468259,
+                        "lo": 14387190051538210308
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3457062230836051077,
-                            "lo": 12921821251131138052
+                            "hi": 7425660765689468259,
+                            "lo": 14387190051538210308
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3457062230836051077,
-                                  "lo": 12921821251131138052
+                                  "hi": 7425660765689468259,
+                                  "lo": 14387190051538210308
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3457062230836051077,
-                                  "lo": 12921821251131138052
+                                  "hi": 7425660765689468259,
+                                  "lo": 14387190051538210308
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3457062230836051077,
-                            "lo": 12921821251131138052
+                            "hi": 7425660765689468259,
+                            "lo": 14387190051538210308
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3457062230836051077,
-                            "lo": 12921821251131138052
+                            "hi": 7425660765689468259,
+                            "lo": 14387190051538210308
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 7425660765689468259,
+                            "lo": 14387190051538210308
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 3457062230836051077,
-                          "lo": 12921821251131138052
+                          "hi": 7425660765689468259,
+                          "lo": 14387190051538210308
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.246.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.246.json
index 8e096f4f..e1f58020 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.246.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.246.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4198695651642990738,
-                    "lo": 12491146367367282250
+                    "hi": 1863337221370890797,
+                    "lo": 6749322430202220085
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4198695651642990738,
-                    "lo": 12491146367367282250
+                    "hi": 1863337221370890797,
+                    "lo": 6749322430202220085
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4198695651642990738,
-                        "lo": 12491146367367282250
+                        "hi": 1863337221370890797,
+                        "lo": 6749322430202220085
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4198695651642990738,
-                            "lo": 12491146367367282250
+                            "hi": 1863337221370890797,
+                            "lo": 6749322430202220085
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4198695651642990738,
-                                  "lo": 12491146367367282250
+                                  "hi": 1863337221370890797,
+                                  "lo": 6749322430202220085
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4198695651642990738,
-                                  "lo": 12491146367367282250
+                                  "hi": 1863337221370890797,
+                                  "lo": 6749322430202220085
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4198695651642990738,
-                            "lo": 12491146367367282250
+                            "hi": 1863337221370890797,
+                            "lo": 6749322430202220085
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4198695651642990738,
-                            "lo": 12491146367367282250
+                            "hi": 1863337221370890797,
+                            "lo": 6749322430202220085
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 1863337221370890797,
+                            "lo": 6749322430202220085
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4198695651642990738,
-                          "lo": 12491146367367282250
+                          "hi": 1863337221370890797,
+                          "lo": 6749322430202220085
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.247.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.247.json
index d67eb821..f90f0998 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.247.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.247.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5825426793591039884,
-                    "lo": 15464830287886403598
+                    "hi": 803093773693207075,
+                    "lo": 8079954127140742658
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5825426793591039884,
-                    "lo": 15464830287886403598
+                    "hi": 803093773693207075,
+                    "lo": 8079954127140742658
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 5825426793591039884,
-                        "lo": 15464830287886403598
+                        "hi": 803093773693207075,
+                        "lo": 8079954127140742658
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5825426793591039884,
-                            "lo": 15464830287886403598
+                            "hi": 803093773693207075,
+                            "lo": 8079954127140742658
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5825426793591039884,
-                                  "lo": 15464830287886403598
+                                  "hi": 803093773693207075,
+                                  "lo": 8079954127140742658
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5825426793591039884,
-                                  "lo": 15464830287886403598
+                                  "hi": 803093773693207075,
+                                  "lo": 8079954127140742658
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5825426793591039884,
-                            "lo": 15464830287886403598
+                            "hi": 803093773693207075,
+                            "lo": 8079954127140742658
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5825426793591039884,
-                            "lo": 15464830287886403598
+                            "hi": 803093773693207075,
+                            "lo": 8079954127140742658
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 803093773693207075,
+                            "lo": 8079954127140742658
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 5825426793591039884,
-                          "lo": 15464830287886403598
+                          "hi": 803093773693207075,
+                          "lo": 8079954127140742658
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.248.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.248.json
index 17a7a7d2..0af1a8d0 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.248.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.248.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8935999185973402768,
-                    "lo": 11313148288469468045
+                    "hi": 3745895130055764895,
+                    "lo": 16254737685738251789
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8935999185973402768,
-                    "lo": 11313148288469468045
+                    "hi": 3745895130055764895,
+                    "lo": 16254737685738251789
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 8935999185973402768,
-                        "lo": 11313148288469468045
+                        "hi": 3745895130055764895,
+                        "lo": 16254737685738251789
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8935999185973402768,
-                            "lo": 11313148288469468045
+                            "hi": 3745895130055764895,
+                            "lo": 16254737685738251789
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8935999185973402768,
-                                  "lo": 11313148288469468045
+                                  "hi": 3745895130055764895,
+                                  "lo": 16254737685738251789
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8935999185973402768,
-                                  "lo": 11313148288469468045
+                                  "hi": 3745895130055764895,
+                                  "lo": 16254737685738251789
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8935999185973402768,
-                            "lo": 11313148288469468045
+                            "hi": 3745895130055764895,
+                            "lo": 16254737685738251789
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8935999185973402768,
-                            "lo": 11313148288469468045
+                            "hi": 3745895130055764895,
+                            "lo": 16254737685738251789
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 3745895130055764895,
+                            "lo": 16254737685738251789
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 8935999185973402768,
-                          "lo": 11313148288469468045
+                          "hi": 3745895130055764895,
+                          "lo": 16254737685738251789
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.249.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.249.json
index c0862aca..1e0be020 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.249.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.249.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6381067505444559278,
-                    "lo": 14011023340231047096
+                    "hi": 3970847282851253206,
+                    "lo": 9151316501042490871
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6381067505444559278,
-                    "lo": 14011023340231047096
+                    "hi": 3970847282851253206,
+                    "lo": 9151316501042490871
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 6381067505444559278,
-                        "lo": 14011023340231047096
+                        "hi": 3970847282851253206,
+                        "lo": 9151316501042490871
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6381067505444559278,
-                            "lo": 14011023340231047096
+                            "hi": 3970847282851253206,
+                            "lo": 9151316501042490871
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6381067505444559278,
-                                  "lo": 14011023340231047096
+                                  "hi": 3970847282851253206,
+                                  "lo": 9151316501042490871
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6381067505444559278,
-                                  "lo": 14011023340231047096
+                                  "hi": 3970847282851253206,
+                                  "lo": 9151316501042490871
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6381067505444559278,
-                            "lo": 14011023340231047096
+                            "hi": 3970847282851253206,
+                            "lo": 9151316501042490871
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6381067505444559278,
-                            "lo": 14011023340231047096
+                            "hi": 3970847282851253206,
+                            "lo": 9151316501042490871
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 3970847282851253206,
+                            "lo": 9151316501042490871
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 6381067505444559278,
-                          "lo": 14011023340231047096
+                          "hi": 3970847282851253206,
+                          "lo": 9151316501042490871
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.25.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.25.json
index 11966f87..3c789507 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.25.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.25.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7010017848938885007,
-                    "lo": 11995836988277547520
+                    "hi": 3869747013797991270,
+                    "lo": 14145282518545404847
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7010017848938885007,
-                    "lo": 11995836988277547520
+                    "hi": 3869747013797991270,
+                    "lo": 14145282518545404847
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 7010017848938885007,
-                        "lo": 11995836988277547520
+                        "hi": 3869747013797991270,
+                        "lo": 14145282518545404847
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7010017848938885007,
-                            "lo": 11995836988277547520
+                            "hi": 3869747013797991270,
+                            "lo": 14145282518545404847
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7010017848938885007,
-                                  "lo": 11995836988277547520
+                                  "hi": 3869747013797991270,
+                                  "lo": 14145282518545404847
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7010017848938885007,
-                                  "lo": 11995836988277547520
+                                  "hi": 3869747013797991270,
+                                  "lo": 14145282518545404847
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7010017848938885007,
-                            "lo": 11995836988277547520
+                            "hi": 3869747013797991270,
+                            "lo": 14145282518545404847
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7010017848938885007,
-                            "lo": 11995836988277547520
+                            "hi": 3869747013797991270,
+                            "lo": 14145282518545404847
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 3869747013797991270,
+                            "lo": 14145282518545404847
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 7010017848938885007,
-                          "lo": 11995836988277547520
+                          "hi": 3869747013797991270,
+                          "lo": 14145282518545404847
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.250.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.250.json
index 44f1ec03..ef57888e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.250.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.250.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5498886577353472842,
-                    "lo": 7881413928637349830
+                    "hi": 3294591868807002818,
+                    "lo": 3135707175907825849
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5498886577353472842,
-                    "lo": 7881413928637349830
+                    "hi": 3294591868807002818,
+                    "lo": 3135707175907825849
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 5498886577353472842,
-                        "lo": 7881413928637349830
+                        "hi": 3294591868807002818,
+                        "lo": 3135707175907825849
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5498886577353472842,
-                            "lo": 7881413928637349830
+                            "hi": 3294591868807002818,
+                            "lo": 3135707175907825849
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5498886577353472842,
-                                  "lo": 7881413928637349830
+                                  "hi": 3294591868807002818,
+                                  "lo": 3135707175907825849
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5498886577353472842,
-                                  "lo": 7881413928637349830
+                                  "hi": 3294591868807002818,
+                                  "lo": 3135707175907825849
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5498886577353472842,
-                            "lo": 7881413928637349830
+                            "hi": 3294591868807002818,
+                            "lo": 3135707175907825849
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5498886577353472842,
-                            "lo": 7881413928637349830
+                            "hi": 3294591868807002818,
+                            "lo": 3135707175907825849
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 3294591868807002818,
+                            "lo": 3135707175907825849
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 5498886577353472842,
-                          "lo": 7881413928637349830
+                          "hi": 3294591868807002818,
+                          "lo": 3135707175907825849
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.251.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.251.json
index 5eee1453..15b6f001 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.251.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.251.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4157126663944638469,
-                    "lo": 9535275900978820858
+                    "hi": 2732160764477777705,
+                    "lo": 4682845317192751933
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4157126663944638469,
-                    "lo": 9535275900978820858
+                    "hi": 2732160764477777705,
+                    "lo": 4682845317192751933
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4157126663944638469,
-                        "lo": 9535275900978820858
+                        "hi": 2732160764477777705,
+                        "lo": 4682845317192751933
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4157126663944638469,
-                            "lo": 9535275900978820858
+                            "hi": 2732160764477777705,
+                            "lo": 4682845317192751933
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4157126663944638469,
-                                  "lo": 9535275900978820858
+                                  "hi": 2732160764477777705,
+                                  "lo": 4682845317192751933
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4157126663944638469,
-                                  "lo": 9535275900978820858
+                                  "hi": 2732160764477777705,
+                                  "lo": 4682845317192751933
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4157126663944638469,
-                            "lo": 9535275900978820858
+                            "hi": 2732160764477777705,
+                            "lo": 4682845317192751933
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4157126663944638469,
-                            "lo": 9535275900978820858
+                            "hi": 2732160764477777705,
+                            "lo": 4682845317192751933
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 2732160764477777705,
+                            "lo": 4682845317192751933
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4157126663944638469,
-                          "lo": 9535275900978820858
+                          "hi": 2732160764477777705,
+                          "lo": 4682845317192751933
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.252.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.252.json
index a5955912..e433d206 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.252.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.252.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4094345402851124361,
-                    "lo": 7196873198812501163
+                    "hi": 460709097554787002,
+                    "lo": 12898064856140678781
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4094345402851124361,
-                    "lo": 7196873198812501163
+                    "hi": 460709097554787002,
+                    "lo": 12898064856140678781
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4094345402851124361,
-                        "lo": 7196873198812501163
+                        "hi": 460709097554787002,
+                        "lo": 12898064856140678781
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4094345402851124361,
-                            "lo": 7196873198812501163
+                            "hi": 460709097554787002,
+                            "lo": 12898064856140678781
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4094345402851124361,
-                                  "lo": 7196873198812501163
+                                  "hi": 460709097554787002,
+                                  "lo": 12898064856140678781
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4094345402851124361,
-                                  "lo": 7196873198812501163
+                                  "hi": 460709097554787002,
+                                  "lo": 12898064856140678781
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4094345402851124361,
-                            "lo": 7196873198812501163
+                            "hi": 460709097554787002,
+                            "lo": 12898064856140678781
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4094345402851124361,
-                            "lo": 7196873198812501163
+                            "hi": 460709097554787002,
+                            "lo": 12898064856140678781
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 460709097554787002,
+                            "lo": 12898064856140678781
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4094345402851124361,
-                          "lo": 7196873198812501163
+                          "hi": 460709097554787002,
+                          "lo": 12898064856140678781
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.253.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.253.json
index d5400916..7200b63b 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.253.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.253.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2599265067748498765,
-                    "lo": 8401596236533233848
+                    "hi": 8302364852159883076,
+                    "lo": 1620937907129602512
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2599265067748498765,
-                    "lo": 8401596236533233848
+                    "hi": 8302364852159883076,
+                    "lo": 1620937907129602512
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 2599265067748498765,
-                        "lo": 8401596236533233848
+                        "hi": 8302364852159883076,
+                        "lo": 1620937907129602512
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2599265067748498765,
-                            "lo": 8401596236533233848
+                            "hi": 8302364852159883076,
+                            "lo": 1620937907129602512
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2599265067748498765,
-                                  "lo": 8401596236533233848
+                                  "hi": 8302364852159883076,
+                                  "lo": 1620937907129602512
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2599265067748498765,
-                                  "lo": 8401596236533233848
+                                  "hi": 8302364852159883076,
+                                  "lo": 1620937907129602512
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2599265067748498765,
-                            "lo": 8401596236533233848
+                            "hi": 8302364852159883076,
+                            "lo": 1620937907129602512
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2599265067748498765,
-                            "lo": 8401596236533233848
+                            "hi": 8302364852159883076,
+                            "lo": 1620937907129602512
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 8302364852159883076,
+                            "lo": 1620937907129602512
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 2599265067748498765,
-                          "lo": 8401596236533233848
+                          "hi": 8302364852159883076,
+                          "lo": 1620937907129602512
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.254.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.254.json
index 233eaabd..127d3a33 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.254.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.254.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4354080725833212058,
-                    "lo": 1325488208311381864
+                    "hi": 6633777508260676936,
+                    "lo": 7404072769746691382
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4354080725833212058,
-                    "lo": 1325488208311381864
+                    "hi": 6633777508260676936,
+                    "lo": 7404072769746691382
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4354080725833212058,
-                        "lo": 1325488208311381864
+                        "hi": 6633777508260676936,
+                        "lo": 7404072769746691382
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4354080725833212058,
-                            "lo": 1325488208311381864
+                            "hi": 6633777508260676936,
+                            "lo": 7404072769746691382
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4354080725833212058,
-                                  "lo": 1325488208311381864
+                                  "hi": 6633777508260676936,
+                                  "lo": 7404072769746691382
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4354080725833212058,
-                                  "lo": 1325488208311381864
+                                  "hi": 6633777508260676936,
+                                  "lo": 7404072769746691382
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4354080725833212058,
-                            "lo": 1325488208311381864
+                            "hi": 6633777508260676936,
+                            "lo": 7404072769746691382
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4354080725833212058,
-                            "lo": 1325488208311381864
+                            "hi": 6633777508260676936,
+                            "lo": 7404072769746691382
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 6633777508260676936,
+                            "lo": 7404072769746691382
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4354080725833212058,
-                          "lo": 1325488208311381864
+                          "hi": 6633777508260676936,
+                          "lo": 7404072769746691382
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.255.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.255.json
index 36207d94..c5f49f48 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.255.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.255.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2483951769183501936,
-                    "lo": 17641791006025257463
+                    "hi": 7550870887985064617,
+                    "lo": 7663899708368393602
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2483951769183501936,
-                    "lo": 17641791006025257463
+                    "hi": 7550870887985064617,
+                    "lo": 7663899708368393602
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 2483951769183501936,
-                        "lo": 17641791006025257463
+                        "hi": 7550870887985064617,
+                        "lo": 7663899708368393602
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2483951769183501936,
-                            "lo": 17641791006025257463
+                            "hi": 7550870887985064617,
+                            "lo": 7663899708368393602
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2483951769183501936,
-                                  "lo": 17641791006025257463
+                                  "hi": 7550870887985064617,
+                                  "lo": 7663899708368393602
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2483951769183501936,
-                                  "lo": 17641791006025257463
+                                  "hi": 7550870887985064617,
+                                  "lo": 7663899708368393602
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2483951769183501936,
-                            "lo": 17641791006025257463
+                            "hi": 7550870887985064617,
+                            "lo": 7663899708368393602
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2483951769183501936,
-                            "lo": 17641791006025257463
+                            "hi": 7550870887985064617,
+                            "lo": 7663899708368393602
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 7550870887985064617,
+                            "lo": 7663899708368393602
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 2483951769183501936,
-                          "lo": 17641791006025257463
+                          "hi": 7550870887985064617,
+                          "lo": 7663899708368393602
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.256.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.256.json
index 56aa8cf5..54086461 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.256.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.256.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7092225150362470936,
-                    "lo": 12609305523006696250
+                    "hi": 9204166361866745434,
+                    "lo": 12480136192533809008
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7092225150362470936,
-                    "lo": 12609305523006696250
+                    "hi": 9204166361866745434,
+                    "lo": 12480136192533809008
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 7092225150362470936,
-                        "lo": 12609305523006696250
+                        "hi": 9204166361866745434,
+                        "lo": 12480136192533809008
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7092225150362470936,
-                            "lo": 12609305523006696250
+                            "hi": 9204166361866745434,
+                            "lo": 12480136192533809008
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7092225150362470936,
-                                  "lo": 12609305523006696250
+                                  "hi": 9204166361866745434,
+                                  "lo": 12480136192533809008
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7092225150362470936,
-                                  "lo": 12609305523006696250
+                                  "hi": 9204166361866745434,
+                                  "lo": 12480136192533809008
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7092225150362470936,
-                            "lo": 12609305523006696250
+                            "hi": 9204166361866745434,
+                            "lo": 12480136192533809008
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7092225150362470936,
-                            "lo": 12609305523006696250
+                            "hi": 9204166361866745434,
+                            "lo": 12480136192533809008
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 9204166361866745434,
+                            "lo": 12480136192533809008
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 7092225150362470936,
-                          "lo": 12609305523006696250
+                          "hi": 9204166361866745434,
+                          "lo": 12480136192533809008
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.257.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.257.json
index 1b92a228..a18b1fa8 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.257.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.257.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 593007208564169965,
-                    "lo": 12409166970814090559
+                    "hi": 6611340377111973207,
+                    "lo": 15555833493277758983
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 593007208564169965,
-                    "lo": 12409166970814090559
+                    "hi": 6611340377111973207,
+                    "lo": 15555833493277758983
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 593007208564169965,
-                        "lo": 12409166970814090559
+                        "hi": 6611340377111973207,
+                        "lo": 15555833493277758983
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 593007208564169965,
-                            "lo": 12409166970814090559
+                            "hi": 6611340377111973207,
+                            "lo": 15555833493277758983
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 593007208564169965,
-                                  "lo": 12409166970814090559
+                                  "hi": 6611340377111973207,
+                                  "lo": 15555833493277758983
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 593007208564169965,
-                                  "lo": 12409166970814090559
+                                  "hi": 6611340377111973207,
+                                  "lo": 15555833493277758983
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 593007208564169965,
-                            "lo": 12409166970814090559
+                            "hi": 6611340377111973207,
+                            "lo": 15555833493277758983
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 593007208564169965,
-                            "lo": 12409166970814090559
+                            "hi": 6611340377111973207,
+                            "lo": 15555833493277758983
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 6611340377111973207,
+                            "lo": 15555833493277758983
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 593007208564169965,
-                          "lo": 12409166970814090559
+                          "hi": 6611340377111973207,
+                          "lo": 15555833493277758983
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.26.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.26.json
index f34b7966..1009381a 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.26.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.26.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 917052545173475294,
-                    "lo": 11246992222833079628
+                    "hi": 1527320344837947080,
+                    "lo": 761407463762817007
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 917052545173475294,
-                    "lo": 11246992222833079628
+                    "hi": 1527320344837947080,
+                    "lo": 761407463762817007
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 917052545173475294,
-                        "lo": 11246992222833079628
+                        "hi": 1527320344837947080,
+                        "lo": 761407463762817007
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 917052545173475294,
-                            "lo": 11246992222833079628
+                            "hi": 1527320344837947080,
+                            "lo": 761407463762817007
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 917052545173475294,
-                                  "lo": 11246992222833079628
+                                  "hi": 1527320344837947080,
+                                  "lo": 761407463762817007
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 917052545173475294,
-                                  "lo": 11246992222833079628
+                                  "hi": 1527320344837947080,
+                                  "lo": 761407463762817007
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 917052545173475294,
-                            "lo": 11246992222833079628
+                            "hi": 1527320344837947080,
+                            "lo": 761407463762817007
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 917052545173475294,
-                            "lo": 11246992222833079628
+                            "hi": 1527320344837947080,
+                            "lo": 761407463762817007
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 1527320344837947080,
+                            "lo": 761407463762817007
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 917052545173475294,
-                          "lo": 11246992222833079628
+                          "hi": 1527320344837947080,
+                          "lo": 761407463762817007
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.27.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.27.json
index a94f649c..5b36765a 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.27.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.27.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1680329314064974809,
-                    "lo": 14848289398579546961
+                    "hi": 2493768275175596626,
+                    "lo": 6198290255220428275
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1680329314064974809,
-                    "lo": 14848289398579546961
+                    "hi": 2493768275175596626,
+                    "lo": 6198290255220428275
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 1680329314064974809,
-                        "lo": 14848289398579546961
+                        "hi": 2493768275175596626,
+                        "lo": 6198290255220428275
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1680329314064974809,
-                            "lo": 14848289398579546961
+                            "hi": 2493768275175596626,
+                            "lo": 6198290255220428275
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 1680329314064974809,
-                                  "lo": 14848289398579546961
+                                  "hi": 2493768275175596626,
+                                  "lo": 6198290255220428275
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 1680329314064974809,
-                                  "lo": 14848289398579546961
+                                  "hi": 2493768275175596626,
+                                  "lo": 6198290255220428275
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1680329314064974809,
-                            "lo": 14848289398579546961
+                            "hi": 2493768275175596626,
+                            "lo": 6198290255220428275
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1680329314064974809,
-                            "lo": 14848289398579546961
+                            "hi": 2493768275175596626,
+                            "lo": 6198290255220428275
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 2493768275175596626,
+                            "lo": 6198290255220428275
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 1680329314064974809,
-                          "lo": 14848289398579546961
+                          "hi": 2493768275175596626,
+                          "lo": 6198290255220428275
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.28.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.28.json
index 1606bfd7..d0d2e673 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.28.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.28.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4218442365315747856,
-                    "lo": 3699528273588327873
+                    "hi": 1574782304087587247,
+                    "lo": 4931165669431702626
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4218442365315747856,
-                    "lo": 3699528273588327873
+                    "hi": 1574782304087587247,
+                    "lo": 4931165669431702626
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4218442365315747856,
-                        "lo": 3699528273588327873
+                        "hi": 1574782304087587247,
+                        "lo": 4931165669431702626
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4218442365315747856,
-                            "lo": 3699528273588327873
+                            "hi": 1574782304087587247,
+                            "lo": 4931165669431702626
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4218442365315747856,
-                                  "lo": 3699528273588327873
+                                  "hi": 1574782304087587247,
+                                  "lo": 4931165669431702626
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4218442365315747856,
-                                  "lo": 3699528273588327873
+                                  "hi": 1574782304087587247,
+                                  "lo": 4931165669431702626
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4218442365315747856,
-                            "lo": 3699528273588327873
+                            "hi": 1574782304087587247,
+                            "lo": 4931165669431702626
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4218442365315747856,
-                            "lo": 3699528273588327873
+                            "hi": 1574782304087587247,
+                            "lo": 4931165669431702626
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 1574782304087587247,
+                            "lo": 4931165669431702626
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4218442365315747856,
-                          "lo": 3699528273588327873
+                          "hi": 1574782304087587247,
+                          "lo": 4931165669431702626
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.29.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.29.json
index 483b24d4..97efb32f 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.29.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.29.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5329198383745062281,
-                    "lo": 1395639432980943662
+                    "hi": 8815303953318053932,
+                    "lo": 8576706111058160712
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5329198383745062281,
-                    "lo": 1395639432980943662
+                    "hi": 8815303953318053932,
+                    "lo": 8576706111058160712
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 5329198383745062281,
-                        "lo": 1395639432980943662
+                        "hi": 8815303953318053932,
+                        "lo": 8576706111058160712
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5329198383745062281,
-                            "lo": 1395639432980943662
+                            "hi": 8815303953318053932,
+                            "lo": 8576706111058160712
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5329198383745062281,
-                                  "lo": 1395639432980943662
+                                  "hi": 8815303953318053932,
+                                  "lo": 8576706111058160712
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5329198383745062281,
-                                  "lo": 1395639432980943662
+                                  "hi": 8815303953318053932,
+                                  "lo": 8576706111058160712
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5329198383745062281,
-                            "lo": 1395639432980943662
+                            "hi": 8815303953318053932,
+                            "lo": 8576706111058160712
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5329198383745062281,
-                            "lo": 1395639432980943662
+                            "hi": 8815303953318053932,
+                            "lo": 8576706111058160712
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 8815303953318053932,
+                            "lo": 8576706111058160712
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 5329198383745062281,
-                          "lo": 1395639432980943662
+                          "hi": 8815303953318053932,
+                          "lo": 8576706111058160712
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.3.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.3.json
index b1a38a35..2873be38 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.3.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.3.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8910535251072538359,
-                    "lo": 14640777511846878739
+                    "hi": 5691613747905611844,
+                    "lo": 1196903667297013435
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8910535251072538359,
-                    "lo": 14640777511846878739
+                    "hi": 5691613747905611844,
+                    "lo": 1196903667297013435
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 8910535251072538359,
-                        "lo": 14640777511846878739
+                        "hi": 5691613747905611844,
+                        "lo": 1196903667297013435
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8910535251072538359,
-                            "lo": 14640777511846878739
+                            "hi": 5691613747905611844,
+                            "lo": 1196903667297013435
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8910535251072538359,
-                                  "lo": 14640777511846878739
+                                  "hi": 5691613747905611844,
+                                  "lo": 1196903667297013435
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8910535251072538359,
-                                  "lo": 14640777511846878739
+                                  "hi": 5691613747905611844,
+                                  "lo": 1196903667297013435
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8910535251072538359,
-                            "lo": 14640777511846878739
+                            "hi": 5691613747905611844,
+                            "lo": 1196903667297013435
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8910535251072538359,
-                            "lo": 14640777511846878739
+                            "hi": 5691613747905611844,
+                            "lo": 1196903667297013435
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 5691613747905611844,
+                            "lo": 1196903667297013435
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 8910535251072538359,
-                          "lo": 14640777511846878739
+                          "hi": 5691613747905611844,
+                          "lo": 1196903667297013435
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.30.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.30.json
index 0a5dd59e..ae7bf32f 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.30.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.30.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4504101615775253969,
-                    "lo": 13520661823290940690
+                    "hi": 3268162624113894875,
+                    "lo": 14313692720293482585
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4504101615775253969,
-                    "lo": 13520661823290940690
+                    "hi": 3268162624113894875,
+                    "lo": 14313692720293482585
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4504101615775253969,
-                        "lo": 13520661823290940690
+                        "hi": 3268162624113894875,
+                        "lo": 14313692720293482585
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4504101615775253969,
-                            "lo": 13520661823290940690
+                            "hi": 3268162624113894875,
+                            "lo": 14313692720293482585
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4504101615775253969,
-                                  "lo": 13520661823290940690
+                                  "hi": 3268162624113894875,
+                                  "lo": 14313692720293482585
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4504101615775253969,
-                                  "lo": 13520661823290940690
+                                  "hi": 3268162624113894875,
+                                  "lo": 14313692720293482585
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4504101615775253969,
-                            "lo": 13520661823290940690
+                            "hi": 3268162624113894875,
+                            "lo": 14313692720293482585
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4504101615775253969,
-                            "lo": 13520661823290940690
+                            "hi": 3268162624113894875,
+                            "lo": 14313692720293482585
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 3268162624113894875,
+                            "lo": 14313692720293482585
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4504101615775253969,
-                          "lo": 13520661823290940690
+                          "hi": 3268162624113894875,
+                          "lo": 14313692720293482585
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.31.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.31.json
index d35663d3..bd59d824 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.31.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.31.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 563394746914544120,
-                    "lo": 13846429359849854118
+                    "hi": 3261654100342639873,
+                    "lo": 2599079288656059122
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 563394746914544120,
-                    "lo": 13846429359849854118
+                    "hi": 3261654100342639873,
+                    "lo": 2599079288656059122
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 563394746914544120,
-                        "lo": 13846429359849854118
+                        "hi": 3261654100342639873,
+                        "lo": 2599079288656059122
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 563394746914544120,
-                            "lo": 13846429359849854118
+                            "hi": 3261654100342639873,
+                            "lo": 2599079288656059122
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 563394746914544120,
-                                  "lo": 13846429359849854118
+                                  "hi": 3261654100342639873,
+                                  "lo": 2599079288656059122
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 563394746914544120,
-                                  "lo": 13846429359849854118
+                                  "hi": 3261654100342639873,
+                                  "lo": 2599079288656059122
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 563394746914544120,
-                            "lo": 13846429359849854118
+                            "hi": 3261654100342639873,
+                            "lo": 2599079288656059122
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 563394746914544120,
-                            "lo": 13846429359849854118
+                            "hi": 3261654100342639873,
+                            "lo": 2599079288656059122
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 3261654100342639873,
+                            "lo": 2599079288656059122
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 563394746914544120,
-                          "lo": 13846429359849854118
+                          "hi": 3261654100342639873,
+                          "lo": 2599079288656059122
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.32.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.32.json
index f0b71577..fad3fe46 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.32.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.32.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5529085357458568275,
-                    "lo": 1029198821968314545
+                    "hi": 8011262062271210401,
+                    "lo": 15719739769439698095
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5529085357458568275,
-                    "lo": 1029198821968314545
+                    "hi": 8011262062271210401,
+                    "lo": 15719739769439698095
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 5529085357458568275,
-                        "lo": 1029198821968314545
+                        "hi": 8011262062271210401,
+                        "lo": 15719739769439698095
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5529085357458568275,
-                            "lo": 1029198821968314545
+                            "hi": 8011262062271210401,
+                            "lo": 15719739769439698095
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5529085357458568275,
-                                  "lo": 1029198821968314545
+                                  "hi": 8011262062271210401,
+                                  "lo": 15719739769439698095
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5529085357458568275,
-                                  "lo": 1029198821968314545
+                                  "hi": 8011262062271210401,
+                                  "lo": 15719739769439698095
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5529085357458568275,
-                            "lo": 1029198821968314545
+                            "hi": 8011262062271210401,
+                            "lo": 15719739769439698095
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5529085357458568275,
-                            "lo": 1029198821968314545
+                            "hi": 8011262062271210401,
+                            "lo": 15719739769439698095
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 8011262062271210401,
+                            "lo": 15719739769439698095
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 5529085357458568275,
-                          "lo": 1029198821968314545
+                          "hi": 8011262062271210401,
+                          "lo": 15719739769439698095
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.33.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.33.json
index 8c6da8bc..f2d62c90 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.33.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.33.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4482331126972168590,
-                    "lo": 11026884866806274497
+                    "hi": 3452751389656080526,
+                    "lo": 958106917135868105
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4482331126972168590,
-                    "lo": 11026884866806274497
+                    "hi": 3452751389656080526,
+                    "lo": 958106917135868105
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4482331126972168590,
-                        "lo": 11026884866806274497
+                        "hi": 3452751389656080526,
+                        "lo": 958106917135868105
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4482331126972168590,
-                            "lo": 11026884866806274497
+                            "hi": 3452751389656080526,
+                            "lo": 958106917135868105
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4482331126972168590,
-                                  "lo": 11026884866806274497
+                                  "hi": 3452751389656080526,
+                                  "lo": 958106917135868105
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4482331126972168590,
-                                  "lo": 11026884866806274497
+                                  "hi": 3452751389656080526,
+                                  "lo": 958106917135868105
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4482331126972168590,
-                            "lo": 11026884866806274497
+                            "hi": 3452751389656080526,
+                            "lo": 958106917135868105
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4482331126972168590,
-                            "lo": 11026884866806274497
+                            "hi": 3452751389656080526,
+                            "lo": 958106917135868105
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 3452751389656080526,
+                            "lo": 958106917135868105
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4482331126972168590,
-                          "lo": 11026884866806274497
+                          "hi": 3452751389656080526,
+                          "lo": 958106917135868105
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.34.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.34.json
index 87a862c5..f6bdb0fa 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.34.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.34.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4297769392919517551,
-                    "lo": 4367988952056313472
+                    "hi": 295577790074353364,
+                    "lo": 6125828362965503973
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4297769392919517551,
-                    "lo": 4367988952056313472
+                    "hi": 295577790074353364,
+                    "lo": 6125828362965503973
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4297769392919517551,
-                        "lo": 4367988952056313472
+                        "hi": 295577790074353364,
+                        "lo": 6125828362965503973
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4297769392919517551,
-                            "lo": 4367988952056313472
+                            "hi": 295577790074353364,
+                            "lo": 6125828362965503973
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4297769392919517551,
-                                  "lo": 4367988952056313472
+                                  "hi": 295577790074353364,
+                                  "lo": 6125828362965503973
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4297769392919517551,
-                                  "lo": 4367988952056313472
+                                  "hi": 295577790074353364,
+                                  "lo": 6125828362965503973
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4297769392919517551,
-                            "lo": 4367988952056313472
+                            "hi": 295577790074353364,
+                            "lo": 6125828362965503973
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4297769392919517551,
-                            "lo": 4367988952056313472
+                            "hi": 295577790074353364,
+                            "lo": 6125828362965503973
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 295577790074353364,
+                            "lo": 6125828362965503973
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4297769392919517551,
-                          "lo": 4367988952056313472
+                          "hi": 295577790074353364,
+                          "lo": 6125828362965503973
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.35.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.35.json
index bd0e0dbc..7c585e30 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.35.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.35.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6765260850084804860,
-                    "lo": 14421178126550670693
+                    "hi": 7362468031023952308,
+                    "lo": 10711108225502253264
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6765260850084804860,
-                    "lo": 14421178126550670693
+                    "hi": 7362468031023952308,
+                    "lo": 10711108225502253264
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 6765260850084804860,
-                        "lo": 14421178126550670693
+                        "hi": 7362468031023952308,
+                        "lo": 10711108225502253264
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6765260850084804860,
-                            "lo": 14421178126550670693
+                            "hi": 7362468031023952308,
+                            "lo": 10711108225502253264
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6765260850084804860,
-                                  "lo": 14421178126550670693
+                                  "hi": 7362468031023952308,
+                                  "lo": 10711108225502253264
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6765260850084804860,
-                                  "lo": 14421178126550670693
+                                  "hi": 7362468031023952308,
+                                  "lo": 10711108225502253264
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6765260850084804860,
-                            "lo": 14421178126550670693
+                            "hi": 7362468031023952308,
+                            "lo": 10711108225502253264
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6765260850084804860,
-                            "lo": 14421178126550670693
+                            "hi": 7362468031023952308,
+                            "lo": 10711108225502253264
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 7362468031023952308,
+                            "lo": 10711108225502253264
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 6765260850084804860,
-                          "lo": 14421178126550670693
+                          "hi": 7362468031023952308,
+                          "lo": 10711108225502253264
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.36.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.36.json
index 2d5b9cb5..d44dd6f1 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.36.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.36.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6482504102525081308,
-                    "lo": 8208318856347792778
+                    "hi": 2431702322271248829,
+                    "lo": 8778261810811495305
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6482504102525081308,
-                    "lo": 8208318856347792778
+                    "hi": 2431702322271248829,
+                    "lo": 8778261810811495305
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 6482504102525081308,
-                        "lo": 8208318856347792778
+                        "hi": 2431702322271248829,
+                        "lo": 8778261810811495305
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6482504102525081308,
-                            "lo": 8208318856347792778
+                            "hi": 2431702322271248829,
+                            "lo": 8778261810811495305
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6482504102525081308,
-                                  "lo": 8208318856347792778
+                                  "hi": 2431702322271248829,
+                                  "lo": 8778261810811495305
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6482504102525081308,
-                                  "lo": 8208318856347792778
+                                  "hi": 2431702322271248829,
+                                  "lo": 8778261810811495305
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6482504102525081308,
-                            "lo": 8208318856347792778
+                            "hi": 2431702322271248829,
+                            "lo": 8778261810811495305
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6482504102525081308,
-                            "lo": 8208318856347792778
+                            "hi": 2431702322271248829,
+                            "lo": 8778261810811495305
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 2431702322271248829,
+                            "lo": 8778261810811495305
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 6482504102525081308,
-                          "lo": 8208318856347792778
+                          "hi": 2431702322271248829,
+                          "lo": 8778261810811495305
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.37.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.37.json
index 5eaff72f..37f4df66 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.37.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.37.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4270169356408608345,
-                    "lo": 17342365849266141494
+                    "hi": 89437021842634381,
+                    "lo": 16805045202368737014
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4270169356408608345,
-                    "lo": 17342365849266141494
+                    "hi": 89437021842634381,
+                    "lo": 16805045202368737014
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4270169356408608345,
-                        "lo": 17342365849266141494
+                        "hi": 89437021842634381,
+                        "lo": 16805045202368737014
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4270169356408608345,
-                            "lo": 17342365849266141494
+                            "hi": 89437021842634381,
+                            "lo": 16805045202368737014
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4270169356408608345,
-                                  "lo": 17342365849266141494
+                                  "hi": 89437021842634381,
+                                  "lo": 16805045202368737014
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4270169356408608345,
-                                  "lo": 17342365849266141494
+                                  "hi": 89437021842634381,
+                                  "lo": 16805045202368737014
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4270169356408608345,
-                            "lo": 17342365849266141494
+                            "hi": 89437021842634381,
+                            "lo": 16805045202368737014
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4270169356408608345,
-                            "lo": 17342365849266141494
+                            "hi": 89437021842634381,
+                            "lo": 16805045202368737014
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 89437021842634381,
+                            "lo": 16805045202368737014
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4270169356408608345,
-                          "lo": 17342365849266141494
+                          "hi": 89437021842634381,
+                          "lo": 16805045202368737014
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.38.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.38.json
index 3892ea1c..7fd4605a 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.38.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.38.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1289766989543441229,
-                    "lo": 2012730252164464099
+                    "hi": 493256962547074833,
+                    "lo": 17121843430485592265
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1289766989543441229,
-                    "lo": 2012730252164464099
+                    "hi": 493256962547074833,
+                    "lo": 17121843430485592265
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 1289766989543441229,
-                        "lo": 2012730252164464099
+                        "hi": 493256962547074833,
+                        "lo": 17121843430485592265
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1289766989543441229,
-                            "lo": 2012730252164464099
+                            "hi": 493256962547074833,
+                            "lo": 17121843430485592265
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 1289766989543441229,
-                                  "lo": 2012730252164464099
+                                  "hi": 493256962547074833,
+                                  "lo": 17121843430485592265
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 1289766989543441229,
-                                  "lo": 2012730252164464099
+                                  "hi": 493256962547074833,
+                                  "lo": 17121843430485592265
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1289766989543441229,
-                            "lo": 2012730252164464099
+                            "hi": 493256962547074833,
+                            "lo": 17121843430485592265
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1289766989543441229,
-                            "lo": 2012730252164464099
+                            "hi": 493256962547074833,
+                            "lo": 17121843430485592265
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 493256962547074833,
+                            "lo": 17121843430485592265
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 1289766989543441229,
-                          "lo": 2012730252164464099
+                          "hi": 493256962547074833,
+                          "lo": 17121843430485592265
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.39.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.39.json
index 2c5bec9f..cb09b67d 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.39.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.39.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2154456543386176986,
-                    "lo": 3485666165659665589
+                    "hi": 846266281865545090,
+                    "lo": 9288277738586189681
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2154456543386176986,
-                    "lo": 3485666165659665589
+                    "hi": 846266281865545090,
+                    "lo": 9288277738586189681
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 2154456543386176986,
-                        "lo": 3485666165659665589
+                        "hi": 846266281865545090,
+                        "lo": 9288277738586189681
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2154456543386176986,
-                            "lo": 3485666165659665589
+                            "hi": 846266281865545090,
+                            "lo": 9288277738586189681
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2154456543386176986,
-                                  "lo": 3485666165659665589
+                                  "hi": 846266281865545090,
+                                  "lo": 9288277738586189681
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2154456543386176986,
-                                  "lo": 3485666165659665589
+                                  "hi": 846266281865545090,
+                                  "lo": 9288277738586189681
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2154456543386176986,
-                            "lo": 3485666165659665589
+                            "hi": 846266281865545090,
+                            "lo": 9288277738586189681
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2154456543386176986,
-                            "lo": 3485666165659665589
+                            "hi": 846266281865545090,
+                            "lo": 9288277738586189681
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 846266281865545090,
+                            "lo": 9288277738586189681
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 2154456543386176986,
-                          "lo": 3485666165659665589
+                          "hi": 846266281865545090,
+                          "lo": 9288277738586189681
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.4.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.4.json
index 808162a5..1a2f6896 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.4.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.4.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2480485458798834235,
-                    "lo": 10360374975491327539
+                    "hi": 1401188139825988164,
+                    "lo": 4737317925118506118
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2480485458798834235,
-                    "lo": 10360374975491327539
+                    "hi": 1401188139825988164,
+                    "lo": 4737317925118506118
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 2480485458798834235,
-                        "lo": 10360374975491327539
+                        "hi": 1401188139825988164,
+                        "lo": 4737317925118506118
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2480485458798834235,
-                            "lo": 10360374975491327539
+                            "hi": 1401188139825988164,
+                            "lo": 4737317925118506118
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2480485458798834235,
-                                  "lo": 10360374975491327539
+                                  "hi": 1401188139825988164,
+                                  "lo": 4737317925118506118
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2480485458798834235,
-                                  "lo": 10360374975491327539
+                                  "hi": 1401188139825988164,
+                                  "lo": 4737317925118506118
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2480485458798834235,
-                            "lo": 10360374975491327539
+                            "hi": 1401188139825988164,
+                            "lo": 4737317925118506118
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2480485458798834235,
-                            "lo": 10360374975491327539
+                            "hi": 1401188139825988164,
+                            "lo": 4737317925118506118
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 1401188139825988164,
+                            "lo": 4737317925118506118
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 2480485458798834235,
-                          "lo": 10360374975491327539
+                          "hi": 1401188139825988164,
+                          "lo": 4737317925118506118
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.40.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.40.json
index 44f989de..048d3baf 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.40.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.40.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2928779650374333773,
-                    "lo": 16554819041819734224
+                    "hi": 2872388120362046225,
+                    "lo": 1716006651105271642
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2928779650374333773,
-                    "lo": 16554819041819734224
+                    "hi": 2872388120362046225,
+                    "lo": 1716006651105271642
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 2928779650374333773,
-                        "lo": 16554819041819734224
+                        "hi": 2872388120362046225,
+                        "lo": 1716006651105271642
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2928779650374333773,
-                            "lo": 16554819041819734224
+                            "hi": 2872388120362046225,
+                            "lo": 1716006651105271642
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2928779650374333773,
-                                  "lo": 16554819041819734224
+                                  "hi": 2872388120362046225,
+                                  "lo": 1716006651105271642
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2928779650374333773,
-                                  "lo": 16554819041819734224
+                                  "hi": 2872388120362046225,
+                                  "lo": 1716006651105271642
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2928779650374333773,
-                            "lo": 16554819041819734224
+                            "hi": 2872388120362046225,
+                            "lo": 1716006651105271642
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2928779650374333773,
-                            "lo": 16554819041819734224
+                            "hi": 2872388120362046225,
+                            "lo": 1716006651105271642
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 2872388120362046225,
+                            "lo": 1716006651105271642
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 2928779650374333773,
-                          "lo": 16554819041819734224
+                          "hi": 2872388120362046225,
+                          "lo": 1716006651105271642
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.41.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.41.json
index caf1d7de..6ac27e90 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.41.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.41.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3904645776995788745,
-                    "lo": 8391615499087075488
+                    "hi": 8945202920834881233,
+                    "lo": 9821486496679651982
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3904645776995788745,
-                    "lo": 8391615499087075488
+                    "hi": 8945202920834881233,
+                    "lo": 9821486496679651982
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 3904645776995788745,
-                        "lo": 8391615499087075488
+                        "hi": 8945202920834881233,
+                        "lo": 9821486496679651982
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3904645776995788745,
-                            "lo": 8391615499087075488
+                            "hi": 8945202920834881233,
+                            "lo": 9821486496679651982
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3904645776995788745,
-                                  "lo": 8391615499087075488
+                                  "hi": 8945202920834881233,
+                                  "lo": 9821486496679651982
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3904645776995788745,
-                                  "lo": 8391615499087075488
+                                  "hi": 8945202920834881233,
+                                  "lo": 9821486496679651982
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3904645776995788745,
-                            "lo": 8391615499087075488
+                            "hi": 8945202920834881233,
+                            "lo": 9821486496679651982
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3904645776995788745,
-                            "lo": 8391615499087075488
+                            "hi": 8945202920834881233,
+                            "lo": 9821486496679651982
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 8945202920834881233,
+                            "lo": 9821486496679651982
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 3904645776995788745,
-                          "lo": 8391615499087075488
+                          "hi": 8945202920834881233,
+                          "lo": 9821486496679651982
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.42.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.42.json
index e7a88094..634759bc 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.42.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.42.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7168978630975835498,
-                    "lo": 3047848951541220276
+                    "hi": 9084977187674824336,
+                    "lo": 5127667964765436176
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7168978630975835498,
-                    "lo": 3047848951541220276
+                    "hi": 9084977187674824336,
+                    "lo": 5127667964765436176
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 7168978630975835498,
-                        "lo": 3047848951541220276
+                        "hi": 9084977187674824336,
+                        "lo": 5127667964765436176
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7168978630975835498,
-                            "lo": 3047848951541220276
+                            "hi": 9084977187674824336,
+                            "lo": 5127667964765436176
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7168978630975835498,
-                                  "lo": 3047848951541220276
+                                  "hi": 9084977187674824336,
+                                  "lo": 5127667964765436176
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7168978630975835498,
-                                  "lo": 3047848951541220276
+                                  "hi": 9084977187674824336,
+                                  "lo": 5127667964765436176
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7168978630975835498,
-                            "lo": 3047848951541220276
+                            "hi": 9084977187674824336,
+                            "lo": 5127667964765436176
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7168978630975835498,
-                            "lo": 3047848951541220276
+                            "hi": 9084977187674824336,
+                            "lo": 5127667964765436176
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 9084977187674824336,
+                            "lo": 5127667964765436176
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 7168978630975835498,
-                          "lo": 3047848951541220276
+                          "hi": 9084977187674824336,
+                          "lo": 5127667964765436176
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.43.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.43.json
index 80caa4e8..0316bc56 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.43.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.43.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5901477675818961278,
-                    "lo": 9238952838455612592
+                    "hi": 6347444689061475514,
+                    "lo": 15969172152719823943
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5901477675818961278,
-                    "lo": 9238952838455612592
+                    "hi": 6347444689061475514,
+                    "lo": 15969172152719823943
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 5901477675818961278,
-                        "lo": 9238952838455612592
+                        "hi": 6347444689061475514,
+                        "lo": 15969172152719823943
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5901477675818961278,
-                            "lo": 9238952838455612592
+                            "hi": 6347444689061475514,
+                            "lo": 15969172152719823943
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5901477675818961278,
-                                  "lo": 9238952838455612592
+                                  "hi": 6347444689061475514,
+                                  "lo": 15969172152719823943
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5901477675818961278,
-                                  "lo": 9238952838455612592
+                                  "hi": 6347444689061475514,
+                                  "lo": 15969172152719823943
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5901477675818961278,
-                            "lo": 9238952838455612592
+                            "hi": 6347444689061475514,
+                            "lo": 15969172152719823943
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5901477675818961278,
-                            "lo": 9238952838455612592
+                            "hi": 6347444689061475514,
+                            "lo": 15969172152719823943
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 6347444689061475514,
+                            "lo": 15969172152719823943
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 5901477675818961278,
-                          "lo": 9238952838455612592
+                          "hi": 6347444689061475514,
+                          "lo": 15969172152719823943
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.44.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.44.json
index 51f24610..566baf22 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.44.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.44.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4126361073097466980,
-                    "lo": 1550209759227893521
+                    "hi": 98515119068043887,
+                    "lo": 14114135471595386895
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4126361073097466980,
-                    "lo": 1550209759227893521
+                    "hi": 98515119068043887,
+                    "lo": 14114135471595386895
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4126361073097466980,
-                        "lo": 1550209759227893521
+                        "hi": 98515119068043887,
+                        "lo": 14114135471595386895
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4126361073097466980,
-                            "lo": 1550209759227893521
+                            "hi": 98515119068043887,
+                            "lo": 14114135471595386895
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4126361073097466980,
-                                  "lo": 1550209759227893521
+                                  "hi": 98515119068043887,
+                                  "lo": 14114135471595386895
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4126361073097466980,
-                                  "lo": 1550209759227893521
+                                  "hi": 98515119068043887,
+                                  "lo": 14114135471595386895
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4126361073097466980,
-                            "lo": 1550209759227893521
+                            "hi": 98515119068043887,
+                            "lo": 14114135471595386895
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4126361073097466980,
-                            "lo": 1550209759227893521
+                            "hi": 98515119068043887,
+                            "lo": 14114135471595386895
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 98515119068043887,
+                            "lo": 14114135471595386895
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4126361073097466980,
-                          "lo": 1550209759227893521
+                          "hi": 98515119068043887,
+                          "lo": 14114135471595386895
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.45.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.45.json
index 58240289..65d12ef7 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.45.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.45.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5809686022822341010,
-                    "lo": 4790237255933777353
+                    "hi": 3584266577941272960,
+                    "lo": 6441995118919485964
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5809686022822341010,
-                    "lo": 4790237255933777353
+                    "hi": 3584266577941272960,
+                    "lo": 6441995118919485964
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 5809686022822341010,
-                        "lo": 4790237255933777353
+                        "hi": 3584266577941272960,
+                        "lo": 6441995118919485964
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5809686022822341010,
-                            "lo": 4790237255933777353
+                            "hi": 3584266577941272960,
+                            "lo": 6441995118919485964
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5809686022822341010,
-                                  "lo": 4790237255933777353
+                                  "hi": 3584266577941272960,
+                                  "lo": 6441995118919485964
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5809686022822341010,
-                                  "lo": 4790237255933777353
+                                  "hi": 3584266577941272960,
+                                  "lo": 6441995118919485964
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5809686022822341010,
-                            "lo": 4790237255933777353
+                            "hi": 3584266577941272960,
+                            "lo": 6441995118919485964
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5809686022822341010,
-                            "lo": 4790237255933777353
+                            "hi": 3584266577941272960,
+                            "lo": 6441995118919485964
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 3584266577941272960,
+                            "lo": 6441995118919485964
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 5809686022822341010,
-                          "lo": 4790237255933777353
+                          "hi": 3584266577941272960,
+                          "lo": 6441995118919485964
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.46.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.46.json
index 0d5f6288..d1aa7e69 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.46.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.46.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1772260153436657191,
-                    "lo": 16088940393824386992
+                    "hi": 2196541684211343048,
+                    "lo": 3477189695731894825
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1772260153436657191,
-                    "lo": 16088940393824386992
+                    "hi": 2196541684211343048,
+                    "lo": 3477189695731894825
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 1772260153436657191,
-                        "lo": 16088940393824386992
+                        "hi": 2196541684211343048,
+                        "lo": 3477189695731894825
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1772260153436657191,
-                            "lo": 16088940393824386992
+                            "hi": 2196541684211343048,
+                            "lo": 3477189695731894825
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 1772260153436657191,
-                                  "lo": 16088940393824386992
+                                  "hi": 2196541684211343048,
+                                  "lo": 3477189695731894825
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 1772260153436657191,
-                                  "lo": 16088940393824386992
+                                  "hi": 2196541684211343048,
+                                  "lo": 3477189695731894825
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1772260153436657191,
-                            "lo": 16088940393824386992
+                            "hi": 2196541684211343048,
+                            "lo": 3477189695731894825
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1772260153436657191,
-                            "lo": 16088940393824386992
+                            "hi": 2196541684211343048,
+                            "lo": 3477189695731894825
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 2196541684211343048,
+                            "lo": 3477189695731894825
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 1772260153436657191,
-                          "lo": 16088940393824386992
+                          "hi": 2196541684211343048,
+                          "lo": 3477189695731894825
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.47.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.47.json
index 50e62d7e..de364eda 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.47.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.47.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3357586264146204329,
-                    "lo": 15684993218092137137
+                    "hi": 6332629334159452700,
+                    "lo": 12420056035415833497
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3357586264146204329,
-                    "lo": 15684993218092137137
+                    "hi": 6332629334159452700,
+                    "lo": 12420056035415833497
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 3357586264146204329,
-                        "lo": 15684993218092137137
+                        "hi": 6332629334159452700,
+                        "lo": 12420056035415833497
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3357586264146204329,
-                            "lo": 15684993218092137137
+                            "hi": 6332629334159452700,
+                            "lo": 12420056035415833497
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3357586264146204329,
-                                  "lo": 15684993218092137137
+                                  "hi": 6332629334159452700,
+                                  "lo": 12420056035415833497
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3357586264146204329,
-                                  "lo": 15684993218092137137
+                                  "hi": 6332629334159452700,
+                                  "lo": 12420056035415833497
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3357586264146204329,
-                            "lo": 15684993218092137137
+                            "hi": 6332629334159452700,
+                            "lo": 12420056035415833497
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3357586264146204329,
-                            "lo": 15684993218092137137
+                            "hi": 6332629334159452700,
+                            "lo": 12420056035415833497
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 6332629334159452700,
+                            "lo": 12420056035415833497
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 3357586264146204329,
-                          "lo": 15684993218092137137
+                          "hi": 6332629334159452700,
+                          "lo": 12420056035415833497
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.48.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.48.json
index e1efed30..e13ea9f3 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.48.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.48.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7956383936337822321,
-                    "lo": 7839842222863767170
+                    "hi": 4706331020304861321,
+                    "lo": 6244177268177862937
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7956383936337822321,
-                    "lo": 7839842222863767170
+                    "hi": 4706331020304861321,
+                    "lo": 6244177268177862937
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 7956383936337822321,
-                        "lo": 7839842222863767170
+                        "hi": 4706331020304861321,
+                        "lo": 6244177268177862937
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7956383936337822321,
-                            "lo": 7839842222863767170
+                            "hi": 4706331020304861321,
+                            "lo": 6244177268177862937
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7956383936337822321,
-                                  "lo": 7839842222863767170
+                                  "hi": 4706331020304861321,
+                                  "lo": 6244177268177862937
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7956383936337822321,
-                                  "lo": 7839842222863767170
+                                  "hi": 4706331020304861321,
+                                  "lo": 6244177268177862937
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7956383936337822321,
-                            "lo": 7839842222863767170
+                            "hi": 4706331020304861321,
+                            "lo": 6244177268177862937
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7956383936337822321,
-                            "lo": 7839842222863767170
+                            "hi": 4706331020304861321,
+                            "lo": 6244177268177862937
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 4706331020304861321,
+                            "lo": 6244177268177862937
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 7956383936337822321,
-                          "lo": 7839842222863767170
+                          "hi": 4706331020304861321,
+                          "lo": 6244177268177862937
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.49.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.49.json
index c028f070..0d6e2b3a 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.49.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.49.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7369368795349815955,
-                    "lo": 9223352689695004431
+                    "hi": 8258223376700507240,
+                    "lo": 10772872514219494514
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7369368795349815955,
-                    "lo": 9223352689695004431
+                    "hi": 8258223376700507240,
+                    "lo": 10772872514219494514
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 7369368795349815955,
-                        "lo": 9223352689695004431
+                        "hi": 8258223376700507240,
+                        "lo": 10772872514219494514
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7369368795349815955,
-                            "lo": 9223352689695004431
+                            "hi": 8258223376700507240,
+                            "lo": 10772872514219494514
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7369368795349815955,
-                                  "lo": 9223352689695004431
+                                  "hi": 8258223376700507240,
+                                  "lo": 10772872514219494514
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7369368795349815955,
-                                  "lo": 9223352689695004431
+                                  "hi": 8258223376700507240,
+                                  "lo": 10772872514219494514
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7369368795349815955,
-                            "lo": 9223352689695004431
+                            "hi": 8258223376700507240,
+                            "lo": 10772872514219494514
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7369368795349815955,
-                            "lo": 9223352689695004431
+                            "hi": 8258223376700507240,
+                            "lo": 10772872514219494514
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 8258223376700507240,
+                            "lo": 10772872514219494514
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 7369368795349815955,
-                          "lo": 9223352689695004431
+                          "hi": 8258223376700507240,
+                          "lo": 10772872514219494514
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.5.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.5.json
index 9ed0d83b..f56bceec 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.5.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.5.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2780662130721656200,
-                    "lo": 207979396269531059
+                    "hi": 1194300054221446761,
+                    "lo": 6556387371325387594
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2780662130721656200,
-                    "lo": 207979396269531059
+                    "hi": 1194300054221446761,
+                    "lo": 6556387371325387594
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 2780662130721656200,
-                        "lo": 207979396269531059
+                        "hi": 1194300054221446761,
+                        "lo": 6556387371325387594
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2780662130721656200,
-                            "lo": 207979396269531059
+                            "hi": 1194300054221446761,
+                            "lo": 6556387371325387594
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2780662130721656200,
-                                  "lo": 207979396269531059
+                                  "hi": 1194300054221446761,
+                                  "lo": 6556387371325387594
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2780662130721656200,
-                                  "lo": 207979396269531059
+                                  "hi": 1194300054221446761,
+                                  "lo": 6556387371325387594
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2780662130721656200,
-                            "lo": 207979396269531059
+                            "hi": 1194300054221446761,
+                            "lo": 6556387371325387594
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2780662130721656200,
-                            "lo": 207979396269531059
+                            "hi": 1194300054221446761,
+                            "lo": 6556387371325387594
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 1194300054221446761,
+                            "lo": 6556387371325387594
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 2780662130721656200,
-                          "lo": 207979396269531059
+                          "hi": 1194300054221446761,
+                          "lo": 6556387371325387594
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.50.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.50.json
index 0077d145..0699fc9b 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.50.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.50.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7917271273302639925,
-                    "lo": 11609097565726757742
+                    "hi": 4381315556271461044,
+                    "lo": 13149979714274135760
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7917271273302639925,
-                    "lo": 11609097565726757742
+                    "hi": 4381315556271461044,
+                    "lo": 13149979714274135760
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 7917271273302639925,
-                        "lo": 11609097565726757742
+                        "hi": 4381315556271461044,
+                        "lo": 13149979714274135760
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7917271273302639925,
-                            "lo": 11609097565726757742
+                            "hi": 4381315556271461044,
+                            "lo": 13149979714274135760
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7917271273302639925,
-                                  "lo": 11609097565726757742
+                                  "hi": 4381315556271461044,
+                                  "lo": 13149979714274135760
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7917271273302639925,
-                                  "lo": 11609097565726757742
+                                  "hi": 4381315556271461044,
+                                  "lo": 13149979714274135760
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7917271273302639925,
-                            "lo": 11609097565726757742
+                            "hi": 4381315556271461044,
+                            "lo": 13149979714274135760
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7917271273302639925,
-                            "lo": 11609097565726757742
+                            "hi": 4381315556271461044,
+                            "lo": 13149979714274135760
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 4381315556271461044,
+                            "lo": 13149979714274135760
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 7917271273302639925,
-                          "lo": 11609097565726757742
+                          "hi": 4381315556271461044,
+                          "lo": 13149979714274135760
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.51.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.51.json
index e3058bd1..062368b5 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.51.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.51.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4233142141924775224,
-                    "lo": 17969334975730275132
+                    "hi": 2188024520148828104,
+                    "lo": 4327897973460316403
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4233142141924775224,
-                    "lo": 17969334975730275132
+                    "hi": 2188024520148828104,
+                    "lo": 4327897973460316403
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4233142141924775224,
-                        "lo": 17969334975730275132
+                        "hi": 2188024520148828104,
+                        "lo": 4327897973460316403
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4233142141924775224,
-                            "lo": 17969334975730275132
+                            "hi": 2188024520148828104,
+                            "lo": 4327897973460316403
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4233142141924775224,
-                                  "lo": 17969334975730275132
+                                  "hi": 2188024520148828104,
+                                  "lo": 4327897973460316403
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4233142141924775224,
-                                  "lo": 17969334975730275132
+                                  "hi": 2188024520148828104,
+                                  "lo": 4327897973460316403
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4233142141924775224,
-                            "lo": 17969334975730275132
+                            "hi": 2188024520148828104,
+                            "lo": 4327897973460316403
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4233142141924775224,
-                            "lo": 17969334975730275132
+                            "hi": 2188024520148828104,
+                            "lo": 4327897973460316403
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 2188024520148828104,
+                            "lo": 4327897973460316403
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4233142141924775224,
-                          "lo": 17969334975730275132
+                          "hi": 2188024520148828104,
+                          "lo": 4327897973460316403
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.52.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.52.json
index 5b6a22b2..4239ebf0 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.52.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.52.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2012580691931281223,
-                    "lo": 2195762997306385162
+                    "hi": 930062826959363455,
+                    "lo": 12120363117411562384
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2012580691931281223,
-                    "lo": 2195762997306385162
+                    "hi": 930062826959363455,
+                    "lo": 12120363117411562384
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 2012580691931281223,
-                        "lo": 2195762997306385162
+                        "hi": 930062826959363455,
+                        "lo": 12120363117411562384
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2012580691931281223,
-                            "lo": 2195762997306385162
+                            "hi": 930062826959363455,
+                            "lo": 12120363117411562384
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2012580691931281223,
-                                  "lo": 2195762997306385162
+                                  "hi": 930062826959363455,
+                                  "lo": 12120363117411562384
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2012580691931281223,
-                                  "lo": 2195762997306385162
+                                  "hi": 930062826959363455,
+                                  "lo": 12120363117411562384
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2012580691931281223,
-                            "lo": 2195762997306385162
+                            "hi": 930062826959363455,
+                            "lo": 12120363117411562384
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2012580691931281223,
-                            "lo": 2195762997306385162
+                            "hi": 930062826959363455,
+                            "lo": 12120363117411562384
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 930062826959363455,
+                            "lo": 12120363117411562384
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 2012580691931281223,
-                          "lo": 2195762997306385162
+                          "hi": 930062826959363455,
+                          "lo": 12120363117411562384
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.53.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.53.json
index d73f8d4e..f330d48d 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.53.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.53.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1283636946523623848,
-                    "lo": 6175176066776929324
+                    "hi": 9186427480553511705,
+                    "lo": 16057720203915732376
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1283636946523623848,
-                    "lo": 6175176066776929324
+                    "hi": 9186427480553511705,
+                    "lo": 16057720203915732376
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 1283636946523623848,
-                        "lo": 6175176066776929324
+                        "hi": 9186427480553511705,
+                        "lo": 16057720203915732376
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1283636946523623848,
-                            "lo": 6175176066776929324
+                            "hi": 9186427480553511705,
+                            "lo": 16057720203915732376
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 1283636946523623848,
-                                  "lo": 6175176066776929324
+                                  "hi": 9186427480553511705,
+                                  "lo": 16057720203915732376
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 1283636946523623848,
-                                  "lo": 6175176066776929324
+                                  "hi": 9186427480553511705,
+                                  "lo": 16057720203915732376
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1283636946523623848,
-                            "lo": 6175176066776929324
+                            "hi": 9186427480553511705,
+                            "lo": 16057720203915732376
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1283636946523623848,
-                            "lo": 6175176066776929324
+                            "hi": 9186427480553511705,
+                            "lo": 16057720203915732376
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 9186427480553511705,
+                            "lo": 16057720203915732376
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 1283636946523623848,
-                          "lo": 6175176066776929324
+                          "hi": 9186427480553511705,
+                          "lo": 16057720203915732376
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.54.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.54.json
index 4d7abbbe..736239f4 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.54.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.54.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8906605372935411561,
-                    "lo": 8231764388154503893
+                    "hi": 356355467523819784,
+                    "lo": 14570235127736477175
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8906605372935411561,
-                    "lo": 8231764388154503893
+                    "hi": 356355467523819784,
+                    "lo": 14570235127736477175
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 8906605372935411561,
-                        "lo": 8231764388154503893
+                        "hi": 356355467523819784,
+                        "lo": 14570235127736477175
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8906605372935411561,
-                            "lo": 8231764388154503893
+                            "hi": 356355467523819784,
+                            "lo": 14570235127736477175
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8906605372935411561,
-                                  "lo": 8231764388154503893
+                                  "hi": 356355467523819784,
+                                  "lo": 14570235127736477175
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8906605372935411561,
-                                  "lo": 8231764388154503893
+                                  "hi": 356355467523819784,
+                                  "lo": 14570235127736477175
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8906605372935411561,
-                            "lo": 8231764388154503893
+                            "hi": 356355467523819784,
+                            "lo": 14570235127736477175
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8906605372935411561,
-                            "lo": 8231764388154503893
+                            "hi": 356355467523819784,
+                            "lo": 14570235127736477175
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 356355467523819784,
+                            "lo": 14570235127736477175
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 8906605372935411561,
-                          "lo": 8231764388154503893
+                          "hi": 356355467523819784,
+                          "lo": 14570235127736477175
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.55.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.55.json
index 5c50eddc..d04ad2b2 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.55.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.55.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3249591711345506813,
-                    "lo": 17912103519854238858
+                    "hi": 6525462395287437187,
+                    "lo": 15860815763479473323
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3249591711345506813,
-                    "lo": 17912103519854238858
+                    "hi": 6525462395287437187,
+                    "lo": 15860815763479473323
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 3249591711345506813,
-                        "lo": 17912103519854238858
+                        "hi": 6525462395287437187,
+                        "lo": 15860815763479473323
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3249591711345506813,
-                            "lo": 17912103519854238858
+                            "hi": 6525462395287437187,
+                            "lo": 15860815763479473323
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3249591711345506813,
-                                  "lo": 17912103519854238858
+                                  "hi": 6525462395287437187,
+                                  "lo": 15860815763479473323
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3249591711345506813,
-                                  "lo": 17912103519854238858
+                                  "hi": 6525462395287437187,
+                                  "lo": 15860815763479473323
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3249591711345506813,
-                            "lo": 17912103519854238858
+                            "hi": 6525462395287437187,
+                            "lo": 15860815763479473323
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3249591711345506813,
-                            "lo": 17912103519854238858
+                            "hi": 6525462395287437187,
+                            "lo": 15860815763479473323
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 6525462395287437187,
+                            "lo": 15860815763479473323
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 3249591711345506813,
-                          "lo": 17912103519854238858
+                          "hi": 6525462395287437187,
+                          "lo": 15860815763479473323
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.56.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.56.json
index 61559a02..28c925e3 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.56.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.56.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4239835050208527915,
-                    "lo": 1613678292474021470
+                    "hi": 7677865853773990287,
+                    "lo": 16213680140462505514
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4239835050208527915,
-                    "lo": 1613678292474021470
+                    "hi": 7677865853773990287,
+                    "lo": 16213680140462505514
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4239835050208527915,
-                        "lo": 1613678292474021470
+                        "hi": 7677865853773990287,
+                        "lo": 16213680140462505514
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4239835050208527915,
-                            "lo": 1613678292474021470
+                            "hi": 7677865853773990287,
+                            "lo": 16213680140462505514
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4239835050208527915,
-                                  "lo": 1613678292474021470
+                                  "hi": 7677865853773990287,
+                                  "lo": 16213680140462505514
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4239835050208527915,
-                                  "lo": 1613678292474021470
+                                  "hi": 7677865853773990287,
+                                  "lo": 16213680140462505514
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4239835050208527915,
-                            "lo": 1613678292474021470
+                            "hi": 7677865853773990287,
+                            "lo": 16213680140462505514
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4239835050208527915,
-                            "lo": 1613678292474021470
+                            "hi": 7677865853773990287,
+                            "lo": 16213680140462505514
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 7677865853773990287,
+                            "lo": 16213680140462505514
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4239835050208527915,
-                          "lo": 1613678292474021470
+                          "hi": 7677865853773990287,
+                          "lo": 16213680140462505514
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.57.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.57.json
index 90efbc5e..a50b7fde 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.57.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.57.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8552044513876911523,
-                    "lo": 17953623246274938738
+                    "hi": 3720745282467409823,
+                    "lo": 14648561421519575346
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8552044513876911523,
-                    "lo": 17953623246274938738
+                    "hi": 3720745282467409823,
+                    "lo": 14648561421519575346
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 8552044513876911523,
-                        "lo": 17953623246274938738
+                        "hi": 3720745282467409823,
+                        "lo": 14648561421519575346
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8552044513876911523,
-                            "lo": 17953623246274938738
+                            "hi": 3720745282467409823,
+                            "lo": 14648561421519575346
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8552044513876911523,
-                                  "lo": 17953623246274938738
+                                  "hi": 3720745282467409823,
+                                  "lo": 14648561421519575346
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8552044513876911523,
-                                  "lo": 17953623246274938738
+                                  "hi": 3720745282467409823,
+                                  "lo": 14648561421519575346
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8552044513876911523,
-                            "lo": 17953623246274938738
+                            "hi": 3720745282467409823,
+                            "lo": 14648561421519575346
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8552044513876911523,
-                            "lo": 17953623246274938738
+                            "hi": 3720745282467409823,
+                            "lo": 14648561421519575346
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 3720745282467409823,
+                            "lo": 14648561421519575346
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 8552044513876911523,
-                          "lo": 17953623246274938738
+                          "hi": 3720745282467409823,
+                          "lo": 14648561421519575346
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.58.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.58.json
index 73ba60d5..80e8e94b 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.58.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.58.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6119081771650902275,
-                    "lo": 660047376397952917
+                    "hi": 2439684849640569849,
+                    "lo": 14466943615385620313
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6119081771650902275,
-                    "lo": 660047376397952917
+                    "hi": 2439684849640569849,
+                    "lo": 14466943615385620313
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 6119081771650902275,
-                        "lo": 660047376397952917
+                        "hi": 2439684849640569849,
+                        "lo": 14466943615385620313
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6119081771650902275,
-                            "lo": 660047376397952917
+                            "hi": 2439684849640569849,
+                            "lo": 14466943615385620313
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6119081771650902275,
-                                  "lo": 660047376397952917
+                                  "hi": 2439684849640569849,
+                                  "lo": 14466943615385620313
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6119081771650902275,
-                                  "lo": 660047376397952917
+                                  "hi": 2439684849640569849,
+                                  "lo": 14466943615385620313
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6119081771650902275,
-                            "lo": 660047376397952917
+                            "hi": 2439684849640569849,
+                            "lo": 14466943615385620313
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6119081771650902275,
-                            "lo": 660047376397952917
+                            "hi": 2439684849640569849,
+                            "lo": 14466943615385620313
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 2439684849640569849,
+                            "lo": 14466943615385620313
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 6119081771650902275,
-                          "lo": 660047376397952917
+                          "hi": 2439684849640569849,
+                          "lo": 14466943615385620313
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.59.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.59.json
index a523cd69..3557d998 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.59.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.59.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7079139424868126954,
-                    "lo": 6840206563208470539
+                    "hi": 2176907840148334988,
+                    "lo": 78128688511915808
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7079139424868126954,
-                    "lo": 6840206563208470539
+                    "hi": 2176907840148334988,
+                    "lo": 78128688511915808
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 7079139424868126954,
-                        "lo": 6840206563208470539
+                        "hi": 2176907840148334988,
+                        "lo": 78128688511915808
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7079139424868126954,
-                            "lo": 6840206563208470539
+                            "hi": 2176907840148334988,
+                            "lo": 78128688511915808
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7079139424868126954,
-                                  "lo": 6840206563208470539
+                                  "hi": 2176907840148334988,
+                                  "lo": 78128688511915808
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7079139424868126954,
-                                  "lo": 6840206563208470539
+                                  "hi": 2176907840148334988,
+                                  "lo": 78128688511915808
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7079139424868126954,
-                            "lo": 6840206563208470539
+                            "hi": 2176907840148334988,
+                            "lo": 78128688511915808
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7079139424868126954,
-                            "lo": 6840206563208470539
+                            "hi": 2176907840148334988,
+                            "lo": 78128688511915808
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 2176907840148334988,
+                            "lo": 78128688511915808
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 7079139424868126954,
-                          "lo": 6840206563208470539
+                          "hi": 2176907840148334988,
+                          "lo": 78128688511915808
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.6.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.6.json
index ff8b91e5..6173bb3e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.6.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.6.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3342010851605223734,
-                    "lo": 15489902653271430160
+                    "hi": 5746403662206082124,
+                    "lo": 12865000203246637050
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3342010851605223734,
-                    "lo": 15489902653271430160
+                    "hi": 5746403662206082124,
+                    "lo": 12865000203246637050
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 3342010851605223734,
-                        "lo": 15489902653271430160
+                        "hi": 5746403662206082124,
+                        "lo": 12865000203246637050
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3342010851605223734,
-                            "lo": 15489902653271430160
+                            "hi": 5746403662206082124,
+                            "lo": 12865000203246637050
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3342010851605223734,
-                                  "lo": 15489902653271430160
+                                  "hi": 5746403662206082124,
+                                  "lo": 12865000203246637050
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3342010851605223734,
-                                  "lo": 15489902653271430160
+                                  "hi": 5746403662206082124,
+                                  "lo": 12865000203246637050
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3342010851605223734,
-                            "lo": 15489902653271430160
+                            "hi": 5746403662206082124,
+                            "lo": 12865000203246637050
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3342010851605223734,
-                            "lo": 15489902653271430160
+                            "hi": 5746403662206082124,
+                            "lo": 12865000203246637050
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 5746403662206082124,
+                            "lo": 12865000203246637050
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 3342010851605223734,
-                          "lo": 15489902653271430160
+                          "hi": 5746403662206082124,
+                          "lo": 12865000203246637050
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.60.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.60.json
index c32fd257..64645121 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.60.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.60.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5772028557630413739,
-                    "lo": 9987615251160008092
+                    "hi": 3242765842009193681,
+                    "lo": 3310326143929264843
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5772028557630413739,
-                    "lo": 9987615251160008092
+                    "hi": 3242765842009193681,
+                    "lo": 3310326143929264843
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 5772028557630413739,
-                        "lo": 9987615251160008092
+                        "hi": 3242765842009193681,
+                        "lo": 3310326143929264843
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5772028557630413739,
-                            "lo": 9987615251160008092
+                            "hi": 3242765842009193681,
+                            "lo": 3310326143929264843
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5772028557630413739,
-                                  "lo": 9987615251160008092
+                                  "hi": 3242765842009193681,
+                                  "lo": 3310326143929264843
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5772028557630413739,
-                                  "lo": 9987615251160008092
+                                  "hi": 3242765842009193681,
+                                  "lo": 3310326143929264843
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5772028557630413739,
-                            "lo": 9987615251160008092
+                            "hi": 3242765842009193681,
+                            "lo": 3310326143929264843
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5772028557630413739,
-                            "lo": 9987615251160008092
+                            "hi": 3242765842009193681,
+                            "lo": 3310326143929264843
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 3242765842009193681,
+                            "lo": 3310326143929264843
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 5772028557630413739,
-                          "lo": 9987615251160008092
+                          "hi": 3242765842009193681,
+                          "lo": 3310326143929264843
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.61.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.61.json
index 44f8b79c..f9f2faa3 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.61.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.61.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1100944064839272420,
-                    "lo": 17904737223775464532
+                    "hi": 1472476951377218260,
+                    "lo": 9830172552219220419
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1100944064839272420,
-                    "lo": 17904737223775464532
+                    "hi": 1472476951377218260,
+                    "lo": 9830172552219220419
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 1100944064839272420,
-                        "lo": 17904737223775464532
+                        "hi": 1472476951377218260,
+                        "lo": 9830172552219220419
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1100944064839272420,
-                            "lo": 17904737223775464532
+                            "hi": 1472476951377218260,
+                            "lo": 9830172552219220419
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 1100944064839272420,
-                                  "lo": 17904737223775464532
+                                  "hi": 1472476951377218260,
+                                  "lo": 9830172552219220419
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 1100944064839272420,
-                                  "lo": 17904737223775464532
+                                  "hi": 1472476951377218260,
+                                  "lo": 9830172552219220419
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1100944064839272420,
-                            "lo": 17904737223775464532
+                            "hi": 1472476951377218260,
+                            "lo": 9830172552219220419
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1100944064839272420,
-                            "lo": 17904737223775464532
+                            "hi": 1472476951377218260,
+                            "lo": 9830172552219220419
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 1472476951377218260,
+                            "lo": 9830172552219220419
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 1100944064839272420,
-                          "lo": 17904737223775464532
+                          "hi": 1472476951377218260,
+                          "lo": 9830172552219220419
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.62.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.62.json
index 833416b8..e711adc7 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.62.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.62.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7225356746176188664,
-                    "lo": 18052694147996901702
+                    "hi": 1309261362126645152,
+                    "lo": 5685205949187602605
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7225356746176188664,
-                    "lo": 18052694147996901702
+                    "hi": 1309261362126645152,
+                    "lo": 5685205949187602605
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 7225356746176188664,
-                        "lo": 18052694147996901702
+                        "hi": 1309261362126645152,
+                        "lo": 5685205949187602605
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7225356746176188664,
-                            "lo": 18052694147996901702
+                            "hi": 1309261362126645152,
+                            "lo": 5685205949187602605
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7225356746176188664,
-                                  "lo": 18052694147996901702
+                                  "hi": 1309261362126645152,
+                                  "lo": 5685205949187602605
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7225356746176188664,
-                                  "lo": 18052694147996901702
+                                  "hi": 1309261362126645152,
+                                  "lo": 5685205949187602605
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7225356746176188664,
-                            "lo": 18052694147996901702
+                            "hi": 1309261362126645152,
+                            "lo": 5685205949187602605
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7225356746176188664,
-                            "lo": 18052694147996901702
+                            "hi": 1309261362126645152,
+                            "lo": 5685205949187602605
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 1309261362126645152,
+                            "lo": 5685205949187602605
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 7225356746176188664,
-                          "lo": 18052694147996901702
+                          "hi": 1309261362126645152,
+                          "lo": 5685205949187602605
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.63.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.63.json
index a64d4205..06991390 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.63.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.63.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3042450148619943320,
-                    "lo": 11695402800109057088
+                    "hi": 1772590332987890910,
+                    "lo": 10702161154070374896
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3042450148619943320,
-                    "lo": 11695402800109057088
+                    "hi": 1772590332987890910,
+                    "lo": 10702161154070374896
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 3042450148619943320,
-                        "lo": 11695402800109057088
+                        "hi": 1772590332987890910,
+                        "lo": 10702161154070374896
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3042450148619943320,
-                            "lo": 11695402800109057088
+                            "hi": 1772590332987890910,
+                            "lo": 10702161154070374896
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3042450148619943320,
-                                  "lo": 11695402800109057088
+                                  "hi": 1772590332987890910,
+                                  "lo": 10702161154070374896
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3042450148619943320,
-                                  "lo": 11695402800109057088
+                                  "hi": 1772590332987890910,
+                                  "lo": 10702161154070374896
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3042450148619943320,
-                            "lo": 11695402800109057088
+                            "hi": 1772590332987890910,
+                            "lo": 10702161154070374896
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3042450148619943320,
-                            "lo": 11695402800109057088
+                            "hi": 1772590332987890910,
+                            "lo": 10702161154070374896
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 1772590332987890910,
+                            "lo": 10702161154070374896
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 3042450148619943320,
-                          "lo": 11695402800109057088
+                          "hi": 1772590332987890910,
+                          "lo": 10702161154070374896
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.64.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.64.json
index f6af8190..19af1322 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.64.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.64.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5452219704081818864,
-                    "lo": 5039201592268388610
+                    "hi": 2475968081819989584,
+                    "lo": 4546044135082720027
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5452219704081818864,
-                    "lo": 5039201592268388610
+                    "hi": 2475968081819989584,
+                    "lo": 4546044135082720027
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 5452219704081818864,
-                        "lo": 5039201592268388610
+                        "hi": 2475968081819989584,
+                        "lo": 4546044135082720027
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5452219704081818864,
-                            "lo": 5039201592268388610
+                            "hi": 2475968081819989584,
+                            "lo": 4546044135082720027
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5452219704081818864,
-                                  "lo": 5039201592268388610
+                                  "hi": 2475968081819989584,
+                                  "lo": 4546044135082720027
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5452219704081818864,
-                                  "lo": 5039201592268388610
+                                  "hi": 2475968081819989584,
+                                  "lo": 4546044135082720027
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5452219704081818864,
-                            "lo": 5039201592268388610
+                            "hi": 2475968081819989584,
+                            "lo": 4546044135082720027
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5452219704081818864,
-                            "lo": 5039201592268388610
+                            "hi": 2475968081819989584,
+                            "lo": 4546044135082720027
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 2475968081819989584,
+                            "lo": 4546044135082720027
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 5452219704081818864,
-                          "lo": 5039201592268388610
+                          "hi": 2475968081819989584,
+                          "lo": 4546044135082720027
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.65.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.65.json
index e31faf4e..50d4a147 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.65.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.65.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3441273121563552205,
-                    "lo": 16889651263302767124
+                    "hi": 168583843347885575,
+                    "lo": 11209313868918005275
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3441273121563552205,
-                    "lo": 16889651263302767124
+                    "hi": 168583843347885575,
+                    "lo": 11209313868918005275
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 3441273121563552205,
-                        "lo": 16889651263302767124
+                        "hi": 168583843347885575,
+                        "lo": 11209313868918005275
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3441273121563552205,
-                            "lo": 16889651263302767124
+                            "hi": 168583843347885575,
+                            "lo": 11209313868918005275
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3441273121563552205,
-                                  "lo": 16889651263302767124
+                                  "hi": 168583843347885575,
+                                  "lo": 11209313868918005275
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3441273121563552205,
-                                  "lo": 16889651263302767124
+                                  "hi": 168583843347885575,
+                                  "lo": 11209313868918005275
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3441273121563552205,
-                            "lo": 16889651263302767124
+                            "hi": 168583843347885575,
+                            "lo": 11209313868918005275
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3441273121563552205,
-                            "lo": 16889651263302767124
+                            "hi": 168583843347885575,
+                            "lo": 11209313868918005275
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 168583843347885575,
+                            "lo": 11209313868918005275
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 3441273121563552205,
-                          "lo": 16889651263302767124
+                          "hi": 168583843347885575,
+                          "lo": 11209313868918005275
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.66.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.66.json
index 8c89ec36..535cdb42 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.66.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.66.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8750491957393530563,
-                    "lo": 10594957244126847053
+                    "hi": 6788246267707320766,
+                    "lo": 12494987996821386577
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8750491957393530563,
-                    "lo": 10594957244126847053
+                    "hi": 6788246267707320766,
+                    "lo": 12494987996821386577
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 8750491957393530563,
-                        "lo": 10594957244126847053
+                        "hi": 6788246267707320766,
+                        "lo": 12494987996821386577
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8750491957393530563,
-                            "lo": 10594957244126847053
+                            "hi": 6788246267707320766,
+                            "lo": 12494987996821386577
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8750491957393530563,
-                                  "lo": 10594957244126847053
+                                  "hi": 6788246267707320766,
+                                  "lo": 12494987996821386577
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8750491957393530563,
-                                  "lo": 10594957244126847053
+                                  "hi": 6788246267707320766,
+                                  "lo": 12494987996821386577
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8750491957393530563,
-                            "lo": 10594957244126847053
+                            "hi": 6788246267707320766,
+                            "lo": 12494987996821386577
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8750491957393530563,
-                            "lo": 10594957244126847053
+                            "hi": 6788246267707320766,
+                            "lo": 12494987996821386577
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 6788246267707320766,
+                            "lo": 12494987996821386577
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 8750491957393530563,
-                          "lo": 10594957244126847053
+                          "hi": 6788246267707320766,
+                          "lo": 12494987996821386577
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.67.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.67.json
index cd165b3d..92137a8e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.67.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.67.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1871981621304061001,
-                    "lo": 14416925551400751216
+                    "hi": 2966038683768275335,
+                    "lo": 16880714512874224082
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1871981621304061001,
-                    "lo": 14416925551400751216
+                    "hi": 2966038683768275335,
+                    "lo": 16880714512874224082
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 1871981621304061001,
-                        "lo": 14416925551400751216
+                        "hi": 2966038683768275335,
+                        "lo": 16880714512874224082
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1871981621304061001,
-                            "lo": 14416925551400751216
+                            "hi": 2966038683768275335,
+                            "lo": 16880714512874224082
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 1871981621304061001,
-                                  "lo": 14416925551400751216
+                                  "hi": 2966038683768275335,
+                                  "lo": 16880714512874224082
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 1871981621304061001,
-                                  "lo": 14416925551400751216
+                                  "hi": 2966038683768275335,
+                                  "lo": 16880714512874224082
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1871981621304061001,
-                            "lo": 14416925551400751216
+                            "hi": 2966038683768275335,
+                            "lo": 16880714512874224082
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1871981621304061001,
-                            "lo": 14416925551400751216
+                            "hi": 2966038683768275335,
+                            "lo": 16880714512874224082
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 2966038683768275335,
+                            "lo": 16880714512874224082
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 1871981621304061001,
-                          "lo": 14416925551400751216
+                          "hi": 2966038683768275335,
+                          "lo": 16880714512874224082
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.68.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.68.json
index e1685166..d116a70d 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.68.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.68.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4934798897740997175,
-                    "lo": 8831715524955784766
+                    "hi": 5992483055335545160,
+                    "lo": 18191635267460794463
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4934798897740997175,
-                    "lo": 8831715524955784766
+                    "hi": 5992483055335545160,
+                    "lo": 18191635267460794463
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4934798897740997175,
-                        "lo": 8831715524955784766
+                        "hi": 5992483055335545160,
+                        "lo": 18191635267460794463
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4934798897740997175,
-                            "lo": 8831715524955784766
+                            "hi": 5992483055335545160,
+                            "lo": 18191635267460794463
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4934798897740997175,
-                                  "lo": 8831715524955784766
+                                  "hi": 5992483055335545160,
+                                  "lo": 18191635267460794463
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4934798897740997175,
-                                  "lo": 8831715524955784766
+                                  "hi": 5992483055335545160,
+                                  "lo": 18191635267460794463
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4934798897740997175,
-                            "lo": 8831715524955784766
+                            "hi": 5992483055335545160,
+                            "lo": 18191635267460794463
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4934798897740997175,
-                            "lo": 8831715524955784766
+                            "hi": 5992483055335545160,
+                            "lo": 18191635267460794463
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 5992483055335545160,
+                            "lo": 18191635267460794463
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4934798897740997175,
-                          "lo": 8831715524955784766
+                          "hi": 5992483055335545160,
+                          "lo": 18191635267460794463
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.69.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.69.json
index 14d0c4f2..ac3faaf5 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.69.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.69.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7466970903169862357,
-                    "lo": 7945087321202069508
+                    "hi": 5598470583429931972,
+                    "lo": 13206830722670304867
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7466970903169862357,
-                    "lo": 7945087321202069508
+                    "hi": 5598470583429931972,
+                    "lo": 13206830722670304867
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 7466970903169862357,
-                        "lo": 7945087321202069508
+                        "hi": 5598470583429931972,
+                        "lo": 13206830722670304867
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7466970903169862357,
-                            "lo": 7945087321202069508
+                            "hi": 5598470583429931972,
+                            "lo": 13206830722670304867
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7466970903169862357,
-                                  "lo": 7945087321202069508
+                                  "hi": 5598470583429931972,
+                                  "lo": 13206830722670304867
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7466970903169862357,
-                                  "lo": 7945087321202069508
+                                  "hi": 5598470583429931972,
+                                  "lo": 13206830722670304867
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7466970903169862357,
-                            "lo": 7945087321202069508
+                            "hi": 5598470583429931972,
+                            "lo": 13206830722670304867
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7466970903169862357,
-                            "lo": 7945087321202069508
+                            "hi": 5598470583429931972,
+                            "lo": 13206830722670304867
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 5598470583429931972,
+                            "lo": 13206830722670304867
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 7466970903169862357,
-                          "lo": 7945087321202069508
+                          "hi": 5598470583429931972,
+                          "lo": 13206830722670304867
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.7.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.7.json
index 80c6ee14..7953c7f0 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.7.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.7.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2329691626295022520,
-                    "lo": 10917822771100159276
+                    "hi": 2095176657455695206,
+                    "lo": 12402656645732489575
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2329691626295022520,
-                    "lo": 10917822771100159276
+                    "hi": 2095176657455695206,
+                    "lo": 12402656645732489575
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 2329691626295022520,
-                        "lo": 10917822771100159276
+                        "hi": 2095176657455695206,
+                        "lo": 12402656645732489575
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2329691626295022520,
-                            "lo": 10917822771100159276
+                            "hi": 2095176657455695206,
+                            "lo": 12402656645732489575
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2329691626295022520,
-                                  "lo": 10917822771100159276
+                                  "hi": 2095176657455695206,
+                                  "lo": 12402656645732489575
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2329691626295022520,
-                                  "lo": 10917822771100159276
+                                  "hi": 2095176657455695206,
+                                  "lo": 12402656645732489575
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2329691626295022520,
-                            "lo": 10917822771100159276
+                            "hi": 2095176657455695206,
+                            "lo": 12402656645732489575
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2329691626295022520,
-                            "lo": 10917822771100159276
+                            "hi": 2095176657455695206,
+                            "lo": 12402656645732489575
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 2095176657455695206,
+                            "lo": 12402656645732489575
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 2329691626295022520,
-                          "lo": 10917822771100159276
+                          "hi": 2095176657455695206,
+                          "lo": 12402656645732489575
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.70.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.70.json
index 330dfe71..8fb85404 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.70.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.70.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1917043486825252110,
-                    "lo": 11871579462834902993
+                    "hi": 4679571509234393130,
+                    "lo": 12779631862394051776
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 1917043486825252110,
-                    "lo": 11871579462834902993
+                    "hi": 4679571509234393130,
+                    "lo": 12779631862394051776
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 1917043486825252110,
-                        "lo": 11871579462834902993
+                        "hi": 4679571509234393130,
+                        "lo": 12779631862394051776
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1917043486825252110,
-                            "lo": 11871579462834902993
+                            "hi": 4679571509234393130,
+                            "lo": 12779631862394051776
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 1917043486825252110,
-                                  "lo": 11871579462834902993
+                                  "hi": 4679571509234393130,
+                                  "lo": 12779631862394051776
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 1917043486825252110,
-                                  "lo": 11871579462834902993
+                                  "hi": 4679571509234393130,
+                                  "lo": 12779631862394051776
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1917043486825252110,
-                            "lo": 11871579462834902993
+                            "hi": 4679571509234393130,
+                            "lo": 12779631862394051776
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 1917043486825252110,
-                            "lo": 11871579462834902993
+                            "hi": 4679571509234393130,
+                            "lo": 12779631862394051776
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 4679571509234393130,
+                            "lo": 12779631862394051776
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 1917043486825252110,
-                          "lo": 11871579462834902993
+                          "hi": 4679571509234393130,
+                          "lo": 12779631862394051776
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.71.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.71.json
index 4be0465c..3ed08843 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.71.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.71.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2238833700971678144,
-                    "lo": 7270815778319263470
+                    "hi": 5560421397364576586,
+                    "lo": 12124622786945388628
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2238833700971678144,
-                    "lo": 7270815778319263470
+                    "hi": 5560421397364576586,
+                    "lo": 12124622786945388628
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 2238833700971678144,
-                        "lo": 7270815778319263470
+                        "hi": 5560421397364576586,
+                        "lo": 12124622786945388628
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2238833700971678144,
-                            "lo": 7270815778319263470
+                            "hi": 5560421397364576586,
+                            "lo": 12124622786945388628
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2238833700971678144,
-                                  "lo": 7270815778319263470
+                                  "hi": 5560421397364576586,
+                                  "lo": 12124622786945388628
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2238833700971678144,
-                                  "lo": 7270815778319263470
+                                  "hi": 5560421397364576586,
+                                  "lo": 12124622786945388628
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2238833700971678144,
-                            "lo": 7270815778319263470
+                            "hi": 5560421397364576586,
+                            "lo": 12124622786945388628
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2238833700971678144,
-                            "lo": 7270815778319263470
+                            "hi": 5560421397364576586,
+                            "lo": 12124622786945388628
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 5560421397364576586,
+                            "lo": 12124622786945388628
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 2238833700971678144,
-                          "lo": 7270815778319263470
+                          "hi": 5560421397364576586,
+                          "lo": 12124622786945388628
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.72.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.72.json
index a5e1f33b..1a189bcd 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.72.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.72.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8641002623926945807,
-                    "lo": 8997996981641278958
+                    "hi": 4177096262185790880,
+                    "lo": 8600577333132560105
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8641002623926945807,
-                    "lo": 8997996981641278958
+                    "hi": 4177096262185790880,
+                    "lo": 8600577333132560105
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 8641002623926945807,
-                        "lo": 8997996981641278958
+                        "hi": 4177096262185790880,
+                        "lo": 8600577333132560105
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8641002623926945807,
-                            "lo": 8997996981641278958
+                            "hi": 4177096262185790880,
+                            "lo": 8600577333132560105
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8641002623926945807,
-                                  "lo": 8997996981641278958
+                                  "hi": 4177096262185790880,
+                                  "lo": 8600577333132560105
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8641002623926945807,
-                                  "lo": 8997996981641278958
+                                  "hi": 4177096262185790880,
+                                  "lo": 8600577333132560105
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8641002623926945807,
-                            "lo": 8997996981641278958
+                            "hi": 4177096262185790880,
+                            "lo": 8600577333132560105
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8641002623926945807,
-                            "lo": 8997996981641278958
+                            "hi": 4177096262185790880,
+                            "lo": 8600577333132560105
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 4177096262185790880,
+                            "lo": 8600577333132560105
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 8641002623926945807,
-                          "lo": 8997996981641278958
+                          "hi": 4177096262185790880,
+                          "lo": 8600577333132560105
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.73.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.73.json
index acf497f4..5f4982e3 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.73.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.73.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 554455231432487035,
-                    "lo": 174288847270122639
+                    "hi": 5591365353362705166,
+                    "lo": 12720940233656719807
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 554455231432487035,
-                    "lo": 174288847270122639
+                    "hi": 5591365353362705166,
+                    "lo": 12720940233656719807
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 554455231432487035,
-                        "lo": 174288847270122639
+                        "hi": 5591365353362705166,
+                        "lo": 12720940233656719807
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 554455231432487035,
-                            "lo": 174288847270122639
+                            "hi": 5591365353362705166,
+                            "lo": 12720940233656719807
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 554455231432487035,
-                                  "lo": 174288847270122639
+                                  "hi": 5591365353362705166,
+                                  "lo": 12720940233656719807
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 554455231432487035,
-                                  "lo": 174288847270122639
+                                  "hi": 5591365353362705166,
+                                  "lo": 12720940233656719807
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 554455231432487035,
-                            "lo": 174288847270122639
+                            "hi": 5591365353362705166,
+                            "lo": 12720940233656719807
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 554455231432487035,
-                            "lo": 174288847270122639
+                            "hi": 5591365353362705166,
+                            "lo": 12720940233656719807
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 5591365353362705166,
+                            "lo": 12720940233656719807
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 554455231432487035,
-                          "lo": 174288847270122639
+                          "hi": 5591365353362705166,
+                          "lo": 12720940233656719807
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.74.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.74.json
index dd56e00e..35228234 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.74.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.74.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7321396989433314761,
-                    "lo": 17934121040003754973
+                    "hi": 3598814643504543849,
+                    "lo": 6261005266735319610
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7321396989433314761,
-                    "lo": 17934121040003754973
+                    "hi": 3598814643504543849,
+                    "lo": 6261005266735319610
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 7321396989433314761,
-                        "lo": 17934121040003754973
+                        "hi": 3598814643504543849,
+                        "lo": 6261005266735319610
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7321396989433314761,
-                            "lo": 17934121040003754973
+                            "hi": 3598814643504543849,
+                            "lo": 6261005266735319610
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7321396989433314761,
-                                  "lo": 17934121040003754973
+                                  "hi": 3598814643504543849,
+                                  "lo": 6261005266735319610
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7321396989433314761,
-                                  "lo": 17934121040003754973
+                                  "hi": 3598814643504543849,
+                                  "lo": 6261005266735319610
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7321396989433314761,
-                            "lo": 17934121040003754973
+                            "hi": 3598814643504543849,
+                            "lo": 6261005266735319610
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7321396989433314761,
-                            "lo": 17934121040003754973
+                            "hi": 3598814643504543849,
+                            "lo": 6261005266735319610
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 3598814643504543849,
+                            "lo": 6261005266735319610
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 7321396989433314761,
-                          "lo": 17934121040003754973
+                          "hi": 3598814643504543849,
+                          "lo": 6261005266735319610
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.75.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.75.json
index 68580c31..2b220a05 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.75.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.75.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 164506621897303014,
-                    "lo": 12930845952289736327
+                    "hi": 8274372239774045109,
+                    "lo": 16630794090065533545
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 164506621897303014,
-                    "lo": 12930845952289736327
+                    "hi": 8274372239774045109,
+                    "lo": 16630794090065533545
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 164506621897303014,
-                        "lo": 12930845952289736327
+                        "hi": 8274372239774045109,
+                        "lo": 16630794090065533545
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 164506621897303014,
-                            "lo": 12930845952289736327
+                            "hi": 8274372239774045109,
+                            "lo": 16630794090065533545
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 164506621897303014,
-                                  "lo": 12930845952289736327
+                                  "hi": 8274372239774045109,
+                                  "lo": 16630794090065533545
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 164506621897303014,
-                                  "lo": 12930845952289736327
+                                  "hi": 8274372239774045109,
+                                  "lo": 16630794090065533545
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 164506621897303014,
-                            "lo": 12930845952289736327
+                            "hi": 8274372239774045109,
+                            "lo": 16630794090065533545
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 164506621897303014,
-                            "lo": 12930845952289736327
+                            "hi": 8274372239774045109,
+                            "lo": 16630794090065533545
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 8274372239774045109,
+                            "lo": 16630794090065533545
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 164506621897303014,
-                          "lo": 12930845952289736327
+                          "hi": 8274372239774045109,
+                          "lo": 16630794090065533545
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.76.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.76.json
index b542a899..2fa8b589 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.76.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.76.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 953585872164400726,
-                    "lo": 4809538051855637810
+                    "hi": 6458685581373233290,
+                    "lo": 14458643737385382882
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 953585872164400726,
-                    "lo": 4809538051855637810
+                    "hi": 6458685581373233290,
+                    "lo": 14458643737385382882
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 953585872164400726,
-                        "lo": 4809538051855637810
+                        "hi": 6458685581373233290,
+                        "lo": 14458643737385382882
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 953585872164400726,
-                            "lo": 4809538051855637810
+                            "hi": 6458685581373233290,
+                            "lo": 14458643737385382882
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 953585872164400726,
-                                  "lo": 4809538051855637810
+                                  "hi": 6458685581373233290,
+                                  "lo": 14458643737385382882
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 953585872164400726,
-                                  "lo": 4809538051855637810
+                                  "hi": 6458685581373233290,
+                                  "lo": 14458643737385382882
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 953585872164400726,
-                            "lo": 4809538051855637810
+                            "hi": 6458685581373233290,
+                            "lo": 14458643737385382882
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 953585872164400726,
-                            "lo": 4809538051855637810
+                            "hi": 6458685581373233290,
+                            "lo": 14458643737385382882
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 6458685581373233290,
+                            "lo": 14458643737385382882
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 953585872164400726,
-                          "lo": 4809538051855637810
+                          "hi": 6458685581373233290,
+                          "lo": 14458643737385382882
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.77.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.77.json
index 10fd5559..a1a9bed7 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.77.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.77.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8661837667694061248,
-                    "lo": 1721273031802120435
+                    "hi": 8659341179877386861,
+                    "lo": 548040992707621800
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8661837667694061248,
-                    "lo": 1721273031802120435
+                    "hi": 8659341179877386861,
+                    "lo": 548040992707621800
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 8661837667694061248,
-                        "lo": 1721273031802120435
+                        "hi": 8659341179877386861,
+                        "lo": 548040992707621800
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8661837667694061248,
-                            "lo": 1721273031802120435
+                            "hi": 8659341179877386861,
+                            "lo": 548040992707621800
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8661837667694061248,
-                                  "lo": 1721273031802120435
+                                  "hi": 8659341179877386861,
+                                  "lo": 548040992707621800
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8661837667694061248,
-                                  "lo": 1721273031802120435
+                                  "hi": 8659341179877386861,
+                                  "lo": 548040992707621800
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8661837667694061248,
-                            "lo": 1721273031802120435
+                            "hi": 8659341179877386861,
+                            "lo": 548040992707621800
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8661837667694061248,
-                            "lo": 1721273031802120435
+                            "hi": 8659341179877386861,
+                            "lo": 548040992707621800
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 8659341179877386861,
+                            "lo": 548040992707621800
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 8661837667694061248,
-                          "lo": 1721273031802120435
+                          "hi": 8659341179877386861,
+                          "lo": 548040992707621800
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.78.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.78.json
index 59804b88..a79abb96 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.78.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.78.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8685305922411569215,
-                    "lo": 17640610104729511499
+                    "hi": 3095460261764669212,
+                    "lo": 11647078924359221108
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8685305922411569215,
-                    "lo": 17640610104729511499
+                    "hi": 3095460261764669212,
+                    "lo": 11647078924359221108
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 8685305922411569215,
-                        "lo": 17640610104729511499
+                        "hi": 3095460261764669212,
+                        "lo": 11647078924359221108
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8685305922411569215,
-                            "lo": 17640610104729511499
+                            "hi": 3095460261764669212,
+                            "lo": 11647078924359221108
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8685305922411569215,
-                                  "lo": 17640610104729511499
+                                  "hi": 3095460261764669212,
+                                  "lo": 11647078924359221108
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8685305922411569215,
-                                  "lo": 17640610104729511499
+                                  "hi": 3095460261764669212,
+                                  "lo": 11647078924359221108
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8685305922411569215,
-                            "lo": 17640610104729511499
+                            "hi": 3095460261764669212,
+                            "lo": 11647078924359221108
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8685305922411569215,
-                            "lo": 17640610104729511499
+                            "hi": 3095460261764669212,
+                            "lo": 11647078924359221108
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 3095460261764669212,
+                            "lo": 11647078924359221108
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 8685305922411569215,
-                          "lo": 17640610104729511499
+                          "hi": 3095460261764669212,
+                          "lo": 11647078924359221108
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.79.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.79.json
index 22548733..392ed5a4 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.79.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.79.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3025532503833732086,
-                    "lo": 4511219693074245458
+                    "hi": 5394100954639958923,
+                    "lo": 9973401104356895216
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3025532503833732086,
-                    "lo": 4511219693074245458
+                    "hi": 5394100954639958923,
+                    "lo": 9973401104356895216
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 3025532503833732086,
-                        "lo": 4511219693074245458
+                        "hi": 5394100954639958923,
+                        "lo": 9973401104356895216
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3025532503833732086,
-                            "lo": 4511219693074245458
+                            "hi": 5394100954639958923,
+                            "lo": 9973401104356895216
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3025532503833732086,
-                                  "lo": 4511219693074245458
+                                  "hi": 5394100954639958923,
+                                  "lo": 9973401104356895216
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3025532503833732086,
-                                  "lo": 4511219693074245458
+                                  "hi": 5394100954639958923,
+                                  "lo": 9973401104356895216
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3025532503833732086,
-                            "lo": 4511219693074245458
+                            "hi": 5394100954639958923,
+                            "lo": 9973401104356895216
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3025532503833732086,
-                            "lo": 4511219693074245458
+                            "hi": 5394100954639958923,
+                            "lo": 9973401104356895216
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 5394100954639958923,
+                            "lo": 9973401104356895216
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 3025532503833732086,
-                          "lo": 4511219693074245458
+                          "hi": 5394100954639958923,
+                          "lo": 9973401104356895216
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.8.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.8.json
index 67cabbc3..99e03673 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.8.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.8.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4576608444302801613,
-                    "lo": 13976630851384072179
+                    "hi": 5188270631878126840,
+                    "lo": 12596414496349017750
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4576608444302801613,
-                    "lo": 13976630851384072179
+                    "hi": 5188270631878126840,
+                    "lo": 12596414496349017750
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4576608444302801613,
-                        "lo": 13976630851384072179
+                        "hi": 5188270631878126840,
+                        "lo": 12596414496349017750
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4576608444302801613,
-                            "lo": 13976630851384072179
+                            "hi": 5188270631878126840,
+                            "lo": 12596414496349017750
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4576608444302801613,
-                                  "lo": 13976630851384072179
+                                  "hi": 5188270631878126840,
+                                  "lo": 12596414496349017750
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4576608444302801613,
-                                  "lo": 13976630851384072179
+                                  "hi": 5188270631878126840,
+                                  "lo": 12596414496349017750
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4576608444302801613,
-                            "lo": 13976630851384072179
+                            "hi": 5188270631878126840,
+                            "lo": 12596414496349017750
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4576608444302801613,
-                            "lo": 13976630851384072179
+                            "hi": 5188270631878126840,
+                            "lo": 12596414496349017750
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 5188270631878126840,
+                            "lo": 12596414496349017750
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4576608444302801613,
-                          "lo": 13976630851384072179
+                          "hi": 5188270631878126840,
+                          "lo": 12596414496349017750
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.80.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.80.json
index c0acecea..1b45527e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.80.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.80.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4061886097745628154,
-                    "lo": 14762388888858624338
+                    "hi": 8543912960696196185,
+                    "lo": 4640860385441674801
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4061886097745628154,
-                    "lo": 14762388888858624338
+                    "hi": 8543912960696196185,
+                    "lo": 4640860385441674801
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4061886097745628154,
-                        "lo": 14762388888858624338
+                        "hi": 8543912960696196185,
+                        "lo": 4640860385441674801
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4061886097745628154,
-                            "lo": 14762388888858624338
+                            "hi": 8543912960696196185,
+                            "lo": 4640860385441674801
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4061886097745628154,
-                                  "lo": 14762388888858624338
+                                  "hi": 8543912960696196185,
+                                  "lo": 4640860385441674801
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4061886097745628154,
-                                  "lo": 14762388888858624338
+                                  "hi": 8543912960696196185,
+                                  "lo": 4640860385441674801
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4061886097745628154,
-                            "lo": 14762388888858624338
+                            "hi": 8543912960696196185,
+                            "lo": 4640860385441674801
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4061886097745628154,
-                            "lo": 14762388888858624338
+                            "hi": 8543912960696196185,
+                            "lo": 4640860385441674801
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 8543912960696196185,
+                            "lo": 4640860385441674801
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4061886097745628154,
-                          "lo": 14762388888858624338
+                          "hi": 8543912960696196185,
+                          "lo": 4640860385441674801
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.81.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.81.json
index 4d153f17..0f82c8b2 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.81.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.81.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8086307765470312686,
-                    "lo": 5512553015563227547
+                    "hi": 9011964082720491008,
+                    "lo": 15759510516644968246
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 8086307765470312686,
-                    "lo": 5512553015563227547
+                    "hi": 9011964082720491008,
+                    "lo": 15759510516644968246
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 8086307765470312686,
-                        "lo": 5512553015563227547
+                        "hi": 9011964082720491008,
+                        "lo": 15759510516644968246
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8086307765470312686,
-                            "lo": 5512553015563227547
+                            "hi": 9011964082720491008,
+                            "lo": 15759510516644968246
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8086307765470312686,
-                                  "lo": 5512553015563227547
+                                  "hi": 9011964082720491008,
+                                  "lo": 15759510516644968246
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 8086307765470312686,
-                                  "lo": 5512553015563227547
+                                  "hi": 9011964082720491008,
+                                  "lo": 15759510516644968246
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8086307765470312686,
-                            "lo": 5512553015563227547
+                            "hi": 9011964082720491008,
+                            "lo": 15759510516644968246
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 8086307765470312686,
-                            "lo": 5512553015563227547
+                            "hi": 9011964082720491008,
+                            "lo": 15759510516644968246
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 9011964082720491008,
+                            "lo": 15759510516644968246
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 8086307765470312686,
-                          "lo": 5512553015563227547
+                          "hi": 9011964082720491008,
+                          "lo": 15759510516644968246
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.82.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.82.json
index c98dca87..479ee091 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.82.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.82.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 159304877147676030,
-                    "lo": 12789518349278548105
+                    "hi": 225578213774091720,
+                    "lo": 162257020107355791
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 159304877147676030,
-                    "lo": 12789518349278548105
+                    "hi": 225578213774091720,
+                    "lo": 162257020107355791
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 159304877147676030,
-                        "lo": 12789518349278548105
+                        "hi": 225578213774091720,
+                        "lo": 162257020107355791
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 159304877147676030,
-                            "lo": 12789518349278548105
+                            "hi": 225578213774091720,
+                            "lo": 162257020107355791
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 159304877147676030,
-                                  "lo": 12789518349278548105
+                                  "hi": 225578213774091720,
+                                  "lo": 162257020107355791
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 159304877147676030,
-                                  "lo": 12789518349278548105
+                                  "hi": 225578213774091720,
+                                  "lo": 162257020107355791
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 159304877147676030,
-                            "lo": 12789518349278548105
+                            "hi": 225578213774091720,
+                            "lo": 162257020107355791
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 159304877147676030,
-                            "lo": 12789518349278548105
+                            "hi": 225578213774091720,
+                            "lo": 162257020107355791
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 225578213774091720,
+                            "lo": 162257020107355791
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 159304877147676030,
-                          "lo": 12789518349278548105
+                          "hi": 225578213774091720,
+                          "lo": 162257020107355791
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.83.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.83.json
index f5d25a48..0486977f 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.83.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.83.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7684156388874755045,
-                    "lo": 8192214682585120113
+                    "hi": 8459911673091354278,
+                    "lo": 11826066938570080728
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7684156388874755045,
-                    "lo": 8192214682585120113
+                    "hi": 8459911673091354278,
+                    "lo": 11826066938570080728
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 7684156388874755045,
-                        "lo": 8192214682585120113
+                        "hi": 8459911673091354278,
+                        "lo": 11826066938570080728
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7684156388874755045,
-                            "lo": 8192214682585120113
+                            "hi": 8459911673091354278,
+                            "lo": 11826066938570080728
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7684156388874755045,
-                                  "lo": 8192214682585120113
+                                  "hi": 8459911673091354278,
+                                  "lo": 11826066938570080728
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7684156388874755045,
-                                  "lo": 8192214682585120113
+                                  "hi": 8459911673091354278,
+                                  "lo": 11826066938570080728
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7684156388874755045,
-                            "lo": 8192214682585120113
+                            "hi": 8459911673091354278,
+                            "lo": 11826066938570080728
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7684156388874755045,
-                            "lo": 8192214682585120113
+                            "hi": 8459911673091354278,
+                            "lo": 11826066938570080728
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 8459911673091354278,
+                            "lo": 11826066938570080728
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 7684156388874755045,
-                          "lo": 8192214682585120113
+                          "hi": 8459911673091354278,
+                          "lo": 11826066938570080728
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.84.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.84.json
index a4747c3a..515b5433 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.84.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.84.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3392887591456832628,
-                    "lo": 14159511341750374287
+                    "hi": 1705318733896368622,
+                    "lo": 17156506827964791770
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3392887591456832628,
-                    "lo": 14159511341750374287
+                    "hi": 1705318733896368622,
+                    "lo": 17156506827964791770
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 3392887591456832628,
-                        "lo": 14159511341750374287
+                        "hi": 1705318733896368622,
+                        "lo": 17156506827964791770
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3392887591456832628,
-                            "lo": 14159511341750374287
+                            "hi": 1705318733896368622,
+                            "lo": 17156506827964791770
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3392887591456832628,
-                                  "lo": 14159511341750374287
+                                  "hi": 1705318733896368622,
+                                  "lo": 17156506827964791770
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3392887591456832628,
-                                  "lo": 14159511341750374287
+                                  "hi": 1705318733896368622,
+                                  "lo": 17156506827964791770
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3392887591456832628,
-                            "lo": 14159511341750374287
+                            "hi": 1705318733896368622,
+                            "lo": 17156506827964791770
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3392887591456832628,
-                            "lo": 14159511341750374287
+                            "hi": 1705318733896368622,
+                            "lo": 17156506827964791770
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 1705318733896368622,
+                            "lo": 17156506827964791770
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 3392887591456832628,
-                          "lo": 14159511341750374287
+                          "hi": 1705318733896368622,
+                          "lo": 17156506827964791770
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.85.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.85.json
index 58dc4ed5..29840e56 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.85.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.85.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7642178534586061311,
-                    "lo": 851074615861601762
+                    "hi": 918198029313592034,
+                    "lo": 13612409281025714311
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7642178534586061311,
-                    "lo": 851074615861601762
+                    "hi": 918198029313592034,
+                    "lo": 13612409281025714311
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 7642178534586061311,
-                        "lo": 851074615861601762
+                        "hi": 918198029313592034,
+                        "lo": 13612409281025714311
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7642178534586061311,
-                            "lo": 851074615861601762
+                            "hi": 918198029313592034,
+                            "lo": 13612409281025714311
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7642178534586061311,
-                                  "lo": 851074615861601762
+                                  "hi": 918198029313592034,
+                                  "lo": 13612409281025714311
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7642178534586061311,
-                                  "lo": 851074615861601762
+                                  "hi": 918198029313592034,
+                                  "lo": 13612409281025714311
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7642178534586061311,
-                            "lo": 851074615861601762
+                            "hi": 918198029313592034,
+                            "lo": 13612409281025714311
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7642178534586061311,
-                            "lo": 851074615861601762
+                            "hi": 918198029313592034,
+                            "lo": 13612409281025714311
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 918198029313592034,
+                            "lo": 13612409281025714311
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 7642178534586061311,
-                          "lo": 851074615861601762
+                          "hi": 918198029313592034,
+                          "lo": 13612409281025714311
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.86.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.86.json
index 2cd30a9d..8a317d99 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.86.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.86.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4830302257769283312,
-                    "lo": 5913661271271177396
+                    "hi": 5199894265428561920,
+                    "lo": 8352644891098075221
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4830302257769283312,
-                    "lo": 5913661271271177396
+                    "hi": 5199894265428561920,
+                    "lo": 8352644891098075221
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4830302257769283312,
-                        "lo": 5913661271271177396
+                        "hi": 5199894265428561920,
+                        "lo": 8352644891098075221
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4830302257769283312,
-                            "lo": 5913661271271177396
+                            "hi": 5199894265428561920,
+                            "lo": 8352644891098075221
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4830302257769283312,
-                                  "lo": 5913661271271177396
+                                  "hi": 5199894265428561920,
+                                  "lo": 8352644891098075221
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4830302257769283312,
-                                  "lo": 5913661271271177396
+                                  "hi": 5199894265428561920,
+                                  "lo": 8352644891098075221
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4830302257769283312,
-                            "lo": 5913661271271177396
+                            "hi": 5199894265428561920,
+                            "lo": 8352644891098075221
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4830302257769283312,
-                            "lo": 5913661271271177396
+                            "hi": 5199894265428561920,
+                            "lo": 8352644891098075221
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 5199894265428561920,
+                            "lo": 8352644891098075221
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4830302257769283312,
-                          "lo": 5913661271271177396
+                          "hi": 5199894265428561920,
+                          "lo": 8352644891098075221
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.87.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.87.json
index c6ef9c9c..f3fbb7b0 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.87.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.87.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2247949039292503525,
-                    "lo": 579773796543833575
+                    "hi": 8923826766398312553,
+                    "lo": 6735392140180449485
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 2247949039292503525,
-                    "lo": 579773796543833575
+                    "hi": 8923826766398312553,
+                    "lo": 6735392140180449485
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 2247949039292503525,
-                        "lo": 579773796543833575
+                        "hi": 8923826766398312553,
+                        "lo": 6735392140180449485
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2247949039292503525,
-                            "lo": 579773796543833575
+                            "hi": 8923826766398312553,
+                            "lo": 6735392140180449485
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2247949039292503525,
-                                  "lo": 579773796543833575
+                                  "hi": 8923826766398312553,
+                                  "lo": 6735392140180449485
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 2247949039292503525,
-                                  "lo": 579773796543833575
+                                  "hi": 8923826766398312553,
+                                  "lo": 6735392140180449485
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2247949039292503525,
-                            "lo": 579773796543833575
+                            "hi": 8923826766398312553,
+                            "lo": 6735392140180449485
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 2247949039292503525,
-                            "lo": 579773796543833575
+                            "hi": 8923826766398312553,
+                            "lo": 6735392140180449485
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 8923826766398312553,
+                            "lo": 6735392140180449485
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 2247949039292503525,
-                          "lo": 579773796543833575
+                          "hi": 8923826766398312553,
+                          "lo": 6735392140180449485
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.88.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.88.json
index 63ea5f4a..b4a46be2 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.88.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.88.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6944720387632299464,
-                    "lo": 10064260242225486389
+                    "hi": 8517841821439267603,
+                    "lo": 10415993193088519514
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6944720387632299464,
-                    "lo": 10064260242225486389
+                    "hi": 8517841821439267603,
+                    "lo": 10415993193088519514
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 6944720387632299464,
-                        "lo": 10064260242225486389
+                        "hi": 8517841821439267603,
+                        "lo": 10415993193088519514
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6944720387632299464,
-                            "lo": 10064260242225486389
+                            "hi": 8517841821439267603,
+                            "lo": 10415993193088519514
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6944720387632299464,
-                                  "lo": 10064260242225486389
+                                  "hi": 8517841821439267603,
+                                  "lo": 10415993193088519514
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6944720387632299464,
-                                  "lo": 10064260242225486389
+                                  "hi": 8517841821439267603,
+                                  "lo": 10415993193088519514
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6944720387632299464,
-                            "lo": 10064260242225486389
+                            "hi": 8517841821439267603,
+                            "lo": 10415993193088519514
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6944720387632299464,
-                            "lo": 10064260242225486389
+                            "hi": 8517841821439267603,
+                            "lo": 10415993193088519514
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 8517841821439267603,
+                            "lo": 10415993193088519514
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 6944720387632299464,
-                          "lo": 10064260242225486389
+                          "hi": 8517841821439267603,
+                          "lo": 10415993193088519514
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.89.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.89.json
index 768d1c21..8148e1b4 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.89.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.89.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 9164824756106814815,
-                    "lo": 3611437651313416111
+                    "hi": 5323772733870311596,
+                    "lo": 9995740161309149859
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 9164824756106814815,
-                    "lo": 3611437651313416111
+                    "hi": 5323772733870311596,
+                    "lo": 9995740161309149859
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 9164824756106814815,
-                        "lo": 3611437651313416111
+                        "hi": 5323772733870311596,
+                        "lo": 9995740161309149859
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 9164824756106814815,
-                            "lo": 3611437651313416111
+                            "hi": 5323772733870311596,
+                            "lo": 9995740161309149859
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 9164824756106814815,
-                                  "lo": 3611437651313416111
+                                  "hi": 5323772733870311596,
+                                  "lo": 9995740161309149859
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 9164824756106814815,
-                                  "lo": 3611437651313416111
+                                  "hi": 5323772733870311596,
+                                  "lo": 9995740161309149859
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 9164824756106814815,
-                            "lo": 3611437651313416111
+                            "hi": 5323772733870311596,
+                            "lo": 9995740161309149859
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 9164824756106814815,
-                            "lo": 3611437651313416111
+                            "hi": 5323772733870311596,
+                            "lo": 9995740161309149859
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 5323772733870311596,
+                            "lo": 9995740161309149859
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 9164824756106814815,
-                          "lo": 3611437651313416111
+                          "hi": 5323772733870311596,
+                          "lo": 9995740161309149859
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.9.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.9.json
index 44397acd..e871f9cd 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.9.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.9.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6045319463245569551,
-                    "lo": 11671368744092336363
+                    "hi": 163528038348865626,
+                    "lo": 7840905770951394740
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6045319463245569551,
-                    "lo": 11671368744092336363
+                    "hi": 163528038348865626,
+                    "lo": 7840905770951394740
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 6045319463245569551,
-                        "lo": 11671368744092336363
+                        "hi": 163528038348865626,
+                        "lo": 7840905770951394740
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6045319463245569551,
-                            "lo": 11671368744092336363
+                            "hi": 163528038348865626,
+                            "lo": 7840905770951394740
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6045319463245569551,
-                                  "lo": 11671368744092336363
+                                  "hi": 163528038348865626,
+                                  "lo": 7840905770951394740
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6045319463245569551,
-                                  "lo": 11671368744092336363
+                                  "hi": 163528038348865626,
+                                  "lo": 7840905770951394740
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6045319463245569551,
-                            "lo": 11671368744092336363
+                            "hi": 163528038348865626,
+                            "lo": 7840905770951394740
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6045319463245569551,
-                            "lo": 11671368744092336363
+                            "hi": 163528038348865626,
+                            "lo": 7840905770951394740
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 163528038348865626,
+                            "lo": 7840905770951394740
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 6045319463245569551,
-                          "lo": 11671368744092336363
+                          "hi": 163528038348865626,
+                          "lo": 7840905770951394740
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.90.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.90.json
index d0ddfa41..99b2e61d 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.90.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.90.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6450168671174534174,
-                    "lo": 2291450723470217796
+                    "hi": 3827930419966912952,
+                    "lo": 10445926582135979520
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 6450168671174534174,
-                    "lo": 2291450723470217796
+                    "hi": 3827930419966912952,
+                    "lo": 10445926582135979520
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 6450168671174534174,
-                        "lo": 2291450723470217796
+                        "hi": 3827930419966912952,
+                        "lo": 10445926582135979520
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6450168671174534174,
-                            "lo": 2291450723470217796
+                            "hi": 3827930419966912952,
+                            "lo": 10445926582135979520
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6450168671174534174,
-                                  "lo": 2291450723470217796
+                                  "hi": 3827930419966912952,
+                                  "lo": 10445926582135979520
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 6450168671174534174,
-                                  "lo": 2291450723470217796
+                                  "hi": 3827930419966912952,
+                                  "lo": 10445926582135979520
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6450168671174534174,
-                            "lo": 2291450723470217796
+                            "hi": 3827930419966912952,
+                            "lo": 10445926582135979520
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 6450168671174534174,
-                            "lo": 2291450723470217796
+                            "hi": 3827930419966912952,
+                            "lo": 10445926582135979520
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 3827930419966912952,
+                            "lo": 10445926582135979520
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 6450168671174534174,
-                          "lo": 2291450723470217796
+                          "hi": 3827930419966912952,
+                          "lo": 10445926582135979520
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.91.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.91.json
index 10ba46a4..fcf3bcef 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.91.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.91.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 439363776531619425,
-                    "lo": 5819368782612450823
+                    "hi": 8216097413007667485,
+                    "lo": 11062571372445882519
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 439363776531619425,
-                    "lo": 5819368782612450823
+                    "hi": 8216097413007667485,
+                    "lo": 11062571372445882519
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 439363776531619425,
-                        "lo": 5819368782612450823
+                        "hi": 8216097413007667485,
+                        "lo": 11062571372445882519
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 439363776531619425,
-                            "lo": 5819368782612450823
+                            "hi": 8216097413007667485,
+                            "lo": 11062571372445882519
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 439363776531619425,
-                                  "lo": 5819368782612450823
+                                  "hi": 8216097413007667485,
+                                  "lo": 11062571372445882519
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 439363776531619425,
-                                  "lo": 5819368782612450823
+                                  "hi": 8216097413007667485,
+                                  "lo": 11062571372445882519
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 439363776531619425,
-                            "lo": 5819368782612450823
+                            "hi": 8216097413007667485,
+                            "lo": 11062571372445882519
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 439363776531619425,
-                            "lo": 5819368782612450823
+                            "hi": 8216097413007667485,
+                            "lo": 11062571372445882519
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 8216097413007667485,
+                            "lo": 11062571372445882519
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 439363776531619425,
-                          "lo": 5819368782612450823
+                          "hi": 8216097413007667485,
+                          "lo": 11062571372445882519
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.92.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.92.json
index 811d37be..7748a21b 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.92.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.92.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 9048920229825942930,
-                    "lo": 6622340459563359075
+                    "hi": 5689899984735036734,
+                    "lo": 2086752161239712784
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 9048920229825942930,
-                    "lo": 6622340459563359075
+                    "hi": 5689899984735036734,
+                    "lo": 2086752161239712784
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 9048920229825942930,
-                        "lo": 6622340459563359075
+                        "hi": 5689899984735036734,
+                        "lo": 2086752161239712784
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 9048920229825942930,
-                            "lo": 6622340459563359075
+                            "hi": 5689899984735036734,
+                            "lo": 2086752161239712784
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 9048920229825942930,
-                                  "lo": 6622340459563359075
+                                  "hi": 5689899984735036734,
+                                  "lo": 2086752161239712784
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 9048920229825942930,
-                                  "lo": 6622340459563359075
+                                  "hi": 5689899984735036734,
+                                  "lo": 2086752161239712784
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 9048920229825942930,
-                            "lo": 6622340459563359075
+                            "hi": 5689899984735036734,
+                            "lo": 2086752161239712784
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 9048920229825942930,
-                            "lo": 6622340459563359075
+                            "hi": 5689899984735036734,
+                            "lo": 2086752161239712784
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 5689899984735036734,
+                            "lo": 2086752161239712784
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 9048920229825942930,
-                          "lo": 6622340459563359075
+                          "hi": 5689899984735036734,
+                          "lo": 2086752161239712784
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.93.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.93.json
index c2576f83..761287c2 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.93.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.93.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5305329401559042547,
-                    "lo": 7451509741087771156
+                    "hi": 6225718549362793645,
+                    "lo": 800973526605693593
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 5305329401559042547,
-                    "lo": 7451509741087771156
+                    "hi": 6225718549362793645,
+                    "lo": 800973526605693593
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 5305329401559042547,
-                        "lo": 7451509741087771156
+                        "hi": 6225718549362793645,
+                        "lo": 800973526605693593
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5305329401559042547,
-                            "lo": 7451509741087771156
+                            "hi": 6225718549362793645,
+                            "lo": 800973526605693593
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5305329401559042547,
-                                  "lo": 7451509741087771156
+                                  "hi": 6225718549362793645,
+                                  "lo": 800973526605693593
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 5305329401559042547,
-                                  "lo": 7451509741087771156
+                                  "hi": 6225718549362793645,
+                                  "lo": 800973526605693593
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5305329401559042547,
-                            "lo": 7451509741087771156
+                            "hi": 6225718549362793645,
+                            "lo": 800973526605693593
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 5305329401559042547,
-                            "lo": 7451509741087771156
+                            "hi": 6225718549362793645,
+                            "lo": 800973526605693593
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 6225718549362793645,
+                            "lo": 800973526605693593
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 5305329401559042547,
-                          "lo": 7451509741087771156
+                          "hi": 6225718549362793645,
+                          "lo": 800973526605693593
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.94.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.94.json
index a22e45be..195a1319 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.94.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.94.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7168134907388196923,
-                    "lo": 15596094646688315792
+                    "hi": 8174696419850158350,
+                    "lo": 15648691267797952214
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7168134907388196923,
-                    "lo": 15596094646688315792
+                    "hi": 8174696419850158350,
+                    "lo": 15648691267797952214
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 7168134907388196923,
-                        "lo": 15596094646688315792
+                        "hi": 8174696419850158350,
+                        "lo": 15648691267797952214
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7168134907388196923,
-                            "lo": 15596094646688315792
+                            "hi": 8174696419850158350,
+                            "lo": 15648691267797952214
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7168134907388196923,
-                                  "lo": 15596094646688315792
+                                  "hi": 8174696419850158350,
+                                  "lo": 15648691267797952214
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7168134907388196923,
-                                  "lo": 15596094646688315792
+                                  "hi": 8174696419850158350,
+                                  "lo": 15648691267797952214
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7168134907388196923,
-                            "lo": 15596094646688315792
+                            "hi": 8174696419850158350,
+                            "lo": 15648691267797952214
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7168134907388196923,
-                            "lo": 15596094646688315792
+                            "hi": 8174696419850158350,
+                            "lo": 15648691267797952214
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 8174696419850158350,
+                            "lo": 15648691267797952214
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 7168134907388196923,
-                          "lo": 15596094646688315792
+                          "hi": 8174696419850158350,
+                          "lo": 15648691267797952214
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.95.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.95.json
index fd285d1a..2ced1563 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.95.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.95.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3055949344538721702,
-                    "lo": 4767604005393696890
+                    "hi": 1476273859863589242,
+                    "lo": 1618163782906028043
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 3055949344538721702,
-                    "lo": 4767604005393696890
+                    "hi": 1476273859863589242,
+                    "lo": 1618163782906028043
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 3055949344538721702,
-                        "lo": 4767604005393696890
+                        "hi": 1476273859863589242,
+                        "lo": 1618163782906028043
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3055949344538721702,
-                            "lo": 4767604005393696890
+                            "hi": 1476273859863589242,
+                            "lo": 1618163782906028043
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3055949344538721702,
-                                  "lo": 4767604005393696890
+                                  "hi": 1476273859863589242,
+                                  "lo": 1618163782906028043
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 3055949344538721702,
-                                  "lo": 4767604005393696890
+                                  "hi": 1476273859863589242,
+                                  "lo": 1618163782906028043
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3055949344538721702,
-                            "lo": 4767604005393696890
+                            "hi": 1476273859863589242,
+                            "lo": 1618163782906028043
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 3055949344538721702,
-                            "lo": 4767604005393696890
+                            "hi": 1476273859863589242,
+                            "lo": 1618163782906028043
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 1476273859863589242,
+                            "lo": 1618163782906028043
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 3055949344538721702,
-                          "lo": 4767604005393696890
+                          "hi": 1476273859863589242,
+                          "lo": 1618163782906028043
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.96.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.96.json
index e68c8222..82073f9a 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.96.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.96.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4763451287644906137,
-                    "lo": 2592256138845094029
+                    "hi": 7123394051405982849,
+                    "lo": 13510789905421979946
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4763451287644906137,
-                    "lo": 2592256138845094029
+                    "hi": 7123394051405982849,
+                    "lo": 13510789905421979946
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4763451287644906137,
-                        "lo": 2592256138845094029
+                        "hi": 7123394051405982849,
+                        "lo": 13510789905421979946
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4763451287644906137,
-                            "lo": 2592256138845094029
+                            "hi": 7123394051405982849,
+                            "lo": 13510789905421979946
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4763451287644906137,
-                                  "lo": 2592256138845094029
+                                  "hi": 7123394051405982849,
+                                  "lo": 13510789905421979946
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4763451287644906137,
-                                  "lo": 2592256138845094029
+                                  "hi": 7123394051405982849,
+                                  "lo": 13510789905421979946
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4763451287644906137,
-                            "lo": 2592256138845094029
+                            "hi": 7123394051405982849,
+                            "lo": 13510789905421979946
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4763451287644906137,
-                            "lo": 2592256138845094029
+                            "hi": 7123394051405982849,
+                            "lo": 13510789905421979946
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 7123394051405982849,
+                            "lo": 13510789905421979946
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4763451287644906137,
-                          "lo": 2592256138845094029
+                          "hi": 7123394051405982849,
+                          "lo": 13510789905421979946
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.97.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.97.json
index 58de1966..fd5265c4 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.97.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.97.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7826621397965271861,
-                    "lo": 10190506188958290518
+                    "hi": 991903196734654406,
+                    "lo": 10802807119106414558
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 7826621397965271861,
-                    "lo": 10190506188958290518
+                    "hi": 991903196734654406,
+                    "lo": 10802807119106414558
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 7826621397965271861,
-                        "lo": 10190506188958290518
+                        "hi": 991903196734654406,
+                        "lo": 10802807119106414558
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7826621397965271861,
-                            "lo": 10190506188958290518
+                            "hi": 991903196734654406,
+                            "lo": 10802807119106414558
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7826621397965271861,
-                                  "lo": 10190506188958290518
+                                  "hi": 991903196734654406,
+                                  "lo": 10802807119106414558
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 7826621397965271861,
-                                  "lo": 10190506188958290518
+                                  "hi": 991903196734654406,
+                                  "lo": 10802807119106414558
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7826621397965271861,
-                            "lo": 10190506188958290518
+                            "hi": 991903196734654406,
+                            "lo": 10802807119106414558
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 7826621397965271861,
-                            "lo": 10190506188958290518
+                            "hi": 991903196734654406,
+                            "lo": 10802807119106414558
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 991903196734654406,
+                            "lo": 10802807119106414558
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 7826621397965271861,
-                          "lo": 10190506188958290518
+                          "hi": 991903196734654406,
+                          "lo": 10802807119106414558
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.98.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.98.json
index a5e49d65..e3b61659 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.98.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.98.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 647889933102034650,
-                    "lo": 7964979338116526110
+                    "hi": 28170442395293127,
+                    "lo": 10437446620846363993
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 647889933102034650,
-                    "lo": 7964979338116526110
+                    "hi": 28170442395293127,
+                    "lo": 10437446620846363993
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 647889933102034650,
-                        "lo": 7964979338116526110
+                        "hi": 28170442395293127,
+                        "lo": 10437446620846363993
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 647889933102034650,
-                            "lo": 7964979338116526110
+                            "hi": 28170442395293127,
+                            "lo": 10437446620846363993
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 647889933102034650,
-                                  "lo": 7964979338116526110
+                                  "hi": 28170442395293127,
+                                  "lo": 10437446620846363993
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 647889933102034650,
-                                  "lo": 7964979338116526110
+                                  "hi": 28170442395293127,
+                                  "lo": 10437446620846363993
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 647889933102034650,
-                            "lo": 7964979338116526110
+                            "hi": 28170442395293127,
+                            "lo": 10437446620846363993
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 647889933102034650,
-                            "lo": 7964979338116526110
+                            "hi": 28170442395293127,
+                            "lo": 10437446620846363993
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 28170442395293127,
+                            "lo": 10437446620846363993
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 647889933102034650,
-                          "lo": 7964979338116526110
+                          "hi": 28170442395293127,
+                          "lo": 10437446620846363993
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.99.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.99.json
index 73c1ba82..06b78c83 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.99.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_deposit_withdraw_no_profit.99.json
@@ -39,8 +39,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4911661862557078284,
-                    "lo": 5497960600869131492
+                    "hi": 2405622543582231284,
+                    "lo": 15681684949829197677
                   }
                 }
               ]
@@ -64,8 +64,8 @@
                 },
                 {
                   "i128": {
-                    "hi": 4911661862557078284,
-                    "lo": 5497960600869131492
+                    "hi": 2405622543582231284,
+                    "lo": 15681684949829197677
                   }
                 }
               ]
@@ -86,8 +86,8 @@
                     },
                     {
                       "i128": {
-                        "hi": 4911661862557078284,
-                        "lo": 5497960600869131492
+                        "hi": 2405622543582231284,
+                        "lo": 15681684949829197677
                       }
                     }
                   ]
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -280,8 +284,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4911661862557078284,
-                            "lo": 5497960600869131492
+                            "hi": 2405622543582231284,
+                            "lo": 15681684949829197677
                           }
                         }
                       },
@@ -309,8 +313,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4911661862557078284,
-                                  "lo": 5497960600869131492
+                                  "hi": 2405622543582231284,
+                                  "lo": 15681684949829197677
                                 }
                               }
                             },
@@ -320,8 +324,8 @@
                               },
                               "val": {
                                 "i128": {
-                                  "hi": 4911661862557078284,
-                                  "lo": 5497960600869131492
+                                  "hi": 2405622543582231284,
+                                  "lo": 15681684949829197677
                                 }
                               }
                             }
@@ -350,8 +354,8 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4911661862557078284,
-                            "lo": 5497960600869131492
+                            "hi": 2405622543582231284,
+                            "lo": 15681684949829197677
                           }
                         }
                       },
@@ -365,8 +369,26 @@
                         },
                         "val": {
                           "i128": {
-                            "hi": 4911661862557078284,
-                            "lo": 5497960600869131492
+                            "hi": 2405622543582231284,
+                            "lo": 15681684949829197677
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 2405622543582231284,
+                            "lo": 15681684949829197677
                           }
                         }
                       }
@@ -456,8 +478,8 @@
                       },
                       "val": {
                         "i128": {
-                          "hi": 4911661862557078284,
-                          "lo": 5497960600869131492
+                          "hi": 2405622543582231284,
+                          "lo": 15681684949829197677
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.1.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.1.json
index 43b67059..02f03304 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.1.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.1.json
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.10.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.10.json
index e933a477..7084fbfc 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.10.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.10.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 201450
+                    "lo": 581707
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 201450
+                    "lo": 581707
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 201450
+                        "lo": 581707
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 10
+                    "lo": 2
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 201550
+                                  "lo": 581807
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 201550
+                            "lo": 581807
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 201550
+                          "lo": 581807
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 10
+                          "lo": 2
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.100.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.100.json
index f36deddd..8638a79d 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.100.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.100.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 281557
+                    "lo": 105746
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 281557
+                    "lo": 105746
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 281557
+                        "lo": 105746
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 3
+                    "lo": 7
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 281657
+                                  "lo": 105846
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 281657
+                            "lo": 105846
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 281657
+                          "lo": 105846
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 3
+                          "lo": 7
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.101.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.101.json
index f1948e89..7265843f 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.101.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.101.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 439555
+                    "lo": 119462
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 439555
+                    "lo": 119462
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 439555
+                        "lo": 119462
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 2
+                    "lo": 6
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 439655
+                                  "lo": 119562
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 439655
+                            "lo": 119562
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 439655
+                          "lo": 119562
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 2
+                          "lo": 6
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.102.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.102.json
index 74d9cb1c..8041bc7a 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.102.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.102.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 246895
+                    "lo": 715425
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 246895
+                    "lo": 715425
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 246895
+                        "lo": 715425
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 7
+                    "lo": 9
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 246995
+                                  "lo": 715525
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 246995
+                            "lo": 715525
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 246995
+                          "lo": 715525
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 7
+                          "lo": 9
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.103.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.103.json
index fcf50191..7b89daf7 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.103.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.103.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 939533
+                    "lo": 711041
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 939533
+                    "lo": 711041
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 939533
+                        "lo": 711041
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 5
+                    "lo": 1
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 939633
+                                  "lo": 711141
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 939633
+                            "lo": 711141
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 939633
+                          "lo": 711141
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 5
+                          "lo": 1
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.104.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.104.json
index fd238921..fc631cff 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.104.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.104.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 611157
+                    "lo": 150261
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 611157
+                    "lo": 150261
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 611157
+                        "lo": 150261
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 2
+                    "lo": 8
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 611257
+                                  "lo": 150361
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 611257
+                            "lo": 150361
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 611257
+                          "lo": 150361
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 2
+                          "lo": 8
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.105.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.105.json
index 2c15f415..6a48a01b 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.105.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.105.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 57611
+                    "lo": 41252
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 57611
+                    "lo": 41252
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 57611
+                        "lo": 41252
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 2
+                    "lo": 4
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 57711
+                                  "lo": 41352
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 57711
+                            "lo": 41352
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 57711
+                          "lo": 41352
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 2
+                          "lo": 4
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.106.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.106.json
index c55df180..040f241e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.106.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.106.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 239796
+                    "lo": 519876
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 239796
+                    "lo": 519876
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 239796
+                        "lo": 519876
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 5
+                    "lo": 7
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 239896
+                                  "lo": 519976
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 239896
+                            "lo": 519976
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 239896
+                          "lo": 519976
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 5
+                          "lo": 7
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.107.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.107.json
index cd3f9818..c79246d8 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.107.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.107.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 853400
+                    "lo": 233918
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 853400
+                    "lo": 233918
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 853400
+                        "lo": 233918
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 2
+                    "lo": 5
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 853500
+                                  "lo": 234018
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 853500
+                            "lo": 234018
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 853500
+                          "lo": 234018
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 2
+                          "lo": 5
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.108.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.108.json
index 324e91c9..b308c75c 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.108.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.108.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 650838
+                    "lo": 705226
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 650838
+                    "lo": 705226
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 650838
+                        "lo": 705226
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 1
+                    "lo": 9
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 650938
+                                  "lo": 705326
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 650938
+                            "lo": 705326
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 650938
+                          "lo": 705326
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 1
+                          "lo": 9
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.109.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.109.json
index b267a700..94d6a362 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.109.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.109.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 377970
+                    "lo": 947551
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 377970
+                    "lo": 947551
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 377970
+                        "lo": 947551
                       }
                     }
                   ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 378070
+                                  "lo": 947651
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 378070
+                            "lo": 947651
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 378070
+                          "lo": 947651
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.11.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.11.json
index 3b0a1fb0..903ff7d7 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.11.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.11.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 260269
+                    "lo": 227778
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 260269
+                    "lo": 227778
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 260269
+                        "lo": 227778
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 3
+                    "lo": 4
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 260369
+                                  "lo": 227878
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 260369
+                            "lo": 227878
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 260369
+                          "lo": 227878
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 3
+                          "lo": 4
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.110.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.110.json
index 6abc2fe2..dc4b106b 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.110.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.110.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 542187
+                    "lo": 396121
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 542187
+                    "lo": 396121
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 542187
+                        "lo": 396121
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 4
+                    "lo": 9
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 542287
+                                  "lo": 396221
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 542287
+                            "lo": 396221
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 542287
+                          "lo": 396221
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 4
+                          "lo": 9
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.111.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.111.json
index 65ca103b..ceab9530 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.111.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.111.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 630845
+                    "lo": 315452
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 630845
+                    "lo": 315452
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 630845
+                        "lo": 315452
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 6
+                    "lo": 7
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 630945
+                                  "lo": 315552
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 630945
+                            "lo": 315552
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 630945
+                          "lo": 315552
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 6
+                          "lo": 7
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.112.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.112.json
index 72e69710..790dd973 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.112.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.112.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 888252
+                    "lo": 880253
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 888252
+                    "lo": 880253
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 888252
+                        "lo": 880253
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 8
+                    "lo": 4
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 888352
+                                  "lo": 880353
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 888352
+                            "lo": 880353
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 888352
+                          "lo": 880353
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 8
+                          "lo": 4
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.113.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.113.json
index b6ca922f..9239403e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.113.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.113.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 788759
+                    "lo": 290362
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 788759
+                    "lo": 290362
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 788759
+                        "lo": 290362
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 8
+                    "lo": 7
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 788859
+                                  "lo": 290462
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 788859
+                            "lo": 290462
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 788859
+                          "lo": 290462
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 8
+                          "lo": 7
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.114.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.114.json
index 914de0f6..f3d9388e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.114.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.114.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 846799
+                    "lo": 537524
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 846799
+                    "lo": 537524
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 846799
+                        "lo": 537524
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 4
+                    "lo": 8
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 846899
+                                  "lo": 537624
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 846899
+                            "lo": 537624
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 846899
+                          "lo": 537624
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 4
+                          "lo": 8
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.115.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.115.json
index 1ade1f9e..7a7e88b2 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.115.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.115.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 276981
+                    "lo": 298455
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 276981
+                    "lo": 298455
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 276981
+                        "lo": 298455
                       }
                     }
                   ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 277081
+                                  "lo": 298555
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 277081
+                            "lo": 298555
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 277081
+                          "lo": 298555
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.116.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.116.json
index 47473089..9af153b3 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.116.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.116.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 350451
+                    "lo": 25152
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 350451
+                    "lo": 25152
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 350451
+                        "lo": 25152
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 5
+                    "lo": 10
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 350551
+                                  "lo": 25252
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 350551
+                            "lo": 25252
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 350551
+                          "lo": 25252
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 5
+                          "lo": 10
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.117.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.117.json
index 9617a49b..2a100669 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.117.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.117.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 233211
+                    "lo": 797227
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 233211
+                    "lo": 797227
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 233211
+                        "lo": 797227
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 9
+                    "lo": 4
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 233311
+                                  "lo": 797327
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 233311
+                            "lo": 797327
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 233311
+                          "lo": 797327
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 9
+                          "lo": 4
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.118.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.118.json
index 8c9465b1..36f194e3 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.118.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.118.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 446857
+                    "lo": 684234
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 446857
+                    "lo": 684234
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 446857
+                        "lo": 684234
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 8
+                    "lo": 2
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 446957
+                                  "lo": 684334
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 446957
+                            "lo": 684334
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 446957
+                          "lo": 684334
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 8
+                          "lo": 2
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.119.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.119.json
index 874aa8e0..9a05f1ee 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.119.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.119.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 886311
+                    "lo": 852682
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 886311
+                    "lo": 852682
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 886311
+                        "lo": 852682
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 1
+                    "lo": 6
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 886411
+                                  "lo": 852782
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 886411
+                            "lo": 852782
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 886411
+                          "lo": 852782
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 1
+                          "lo": 6
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.12.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.12.json
index bc6354e0..f3b315cb 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.12.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.12.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 180818
+                    "lo": 363930
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 180818
+                    "lo": 363930
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 180818
+                        "lo": 363930
                       }
                     }
                   ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 180918
+                                  "lo": 364030
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 180918
+                            "lo": 364030
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 180918
+                          "lo": 364030
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.120.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.120.json
index 8d951530..dfa6a7a6 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.120.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.120.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 124402
+                    "lo": 147758
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 124402
+                    "lo": 147758
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 124402
+                        "lo": 147758
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 9
+                    "lo": 10
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 124502
+                                  "lo": 147858
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 124502
+                            "lo": 147858
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 124502
+                          "lo": 147858
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 9
+                          "lo": 10
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.121.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.121.json
index 98c4c591..758dc762 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.121.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.121.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 281362
+                    "lo": 615782
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 281362
+                    "lo": 615782
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 281362
+                        "lo": 615782
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 8
+                    "lo": 9
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 281462
+                                  "lo": 615882
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 281462
+                            "lo": 615882
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 281462
+                          "lo": 615882
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 8
+                          "lo": 9
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.122.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.122.json
index 3a8cee46..f7e06322 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.122.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.122.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 725650
+                    "lo": 268208
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 725650
+                    "lo": 268208
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 725650
+                        "lo": 268208
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 9
+                    "lo": 2
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 725750
+                                  "lo": 268308
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 725750
+                            "lo": 268308
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 725750
+                          "lo": 268308
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 9
+                          "lo": 2
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.123.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.123.json
index 524f8f04..3cab6de3 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.123.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.123.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 926793
+                    "lo": 989142
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 926793
+                    "lo": 989142
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 926793
+                        "lo": 989142
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 10
+                    "lo": 2
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 926893
+                                  "lo": 989242
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 926893
+                            "lo": 989242
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 926893
+                          "lo": 989242
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 10
+                          "lo": 2
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.124.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.124.json
index c591e47b..8e6613c3 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.124.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.124.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 329091
+                    "lo": 243051
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 329091
+                    "lo": 243051
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 329091
+                        "lo": 243051
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 2
+                    "lo": 4
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 329191
+                                  "lo": 243151
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 329191
+                            "lo": 243151
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 329191
+                          "lo": 243151
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 2
+                          "lo": 4
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.125.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.125.json
index 2666d51d..6989e558 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.125.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.125.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 609130
+                    "lo": 117973
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 609130
+                    "lo": 117973
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 609130
+                        "lo": 117973
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 5
+                    "lo": 6
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 609230
+                                  "lo": 118073
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 609230
+                            "lo": 118073
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 609230
+                          "lo": 118073
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 5
+                          "lo": 6
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.126.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.126.json
index 377ec5a6..80de6243 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.126.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.126.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 941042
+                    "lo": 958964
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 941042
+                    "lo": 958964
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 941042
+                        "lo": 958964
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 4
+                    "lo": 7
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 941142
+                                  "lo": 959064
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 941142
+                            "lo": 959064
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 941142
+                          "lo": 959064
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 4
+                          "lo": 7
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.127.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.127.json
index eb1cf834..2a9d543c 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.127.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.127.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 945754
+                    "lo": 943572
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 945754
+                    "lo": 943572
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 945754
+                        "lo": 943572
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 7
+                    "lo": 4
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 945854
+                                  "lo": 943672
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 945854
+                            "lo": 943672
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 945854
+                          "lo": 943672
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 7
+                          "lo": 4
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.128.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.128.json
index 391f52f6..05a700f7 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.128.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.128.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 186915
+                    "lo": 733103
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 186915
+                    "lo": 733103
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 186915
+                        "lo": 733103
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 8
+                    "lo": 10
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 187015
+                                  "lo": 733203
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 187015
+                            "lo": 733203
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 187015
+                          "lo": 733203
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 8
+                          "lo": 10
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.129.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.129.json
index efc10ffb..51b1e2d3 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.129.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.129.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 181144
+                    "lo": 380758
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 181144
+                    "lo": 380758
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 181144
+                        "lo": 380758
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 5
+                    "lo": 2
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 181244
+                                  "lo": 380858
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 181244
+                            "lo": 380858
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 181244
+                          "lo": 380858
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 5
+                          "lo": 2
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.13.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.13.json
index f1c72bd1..c23436ea 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.13.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.13.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 764162
+                    "lo": 714575
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 764162
+                    "lo": 714575
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 764162
+                        "lo": 714575
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 4
+                    "lo": 7
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 764262
+                                  "lo": 714675
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 764262
+                            "lo": 714675
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 764262
+                          "lo": 714675
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 4
+                          "lo": 7
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.130.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.130.json
index a5ba8725..aee16644 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.130.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.130.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 827658
+                    "lo": 336759
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 827658
+                    "lo": 336759
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 827658
+                        "lo": 336759
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 7
+                    "lo": 6
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 827758
+                                  "lo": 336859
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 827758
+                            "lo": 336859
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 827758
+                          "lo": 336859
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 7
+                          "lo": 6
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.131.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.131.json
index 103fdbd7..4a0a4f0d 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.131.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.131.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 245089
+                    "lo": 911567
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 245089
+                    "lo": 911567
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 245089
+                        "lo": 911567
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 1
+                    "lo": 10
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 245189
+                                  "lo": 911667
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 245189
+                            "lo": 911667
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 245189
+                          "lo": 911667
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 1
+                          "lo": 10
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.132.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.132.json
index 3ccfed41..0d3af32d 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.132.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.132.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 961962
+                    "lo": 779943
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 961962
+                    "lo": 779943
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 961962
+                        "lo": 779943
                       }
                     }
                   ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 962062
+                                  "lo": 780043
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 962062
+                            "lo": 780043
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 962062
+                          "lo": 780043
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.133.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.133.json
index 7df8328f..d0971141 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.133.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.133.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 212539
+                    "lo": 720435
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 212539
+                    "lo": 720435
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 212539
+                        "lo": 720435
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 2
+                    "lo": 3
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 212639
+                                  "lo": 720535
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 212639
+                            "lo": 720535
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 212639
+                          "lo": 720535
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 2
+                          "lo": 3
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.134.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.134.json
index 48e3f34a..66673cc7 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.134.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.134.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 770267
+                    "lo": 474008
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 770267
+                    "lo": 474008
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 770267
+                        "lo": 474008
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 5
+                    "lo": 4
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 770367
+                                  "lo": 474108
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 770367
+                            "lo": 474108
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 770367
+                          "lo": 474108
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 5
+                          "lo": 4
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.135.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.135.json
index 6902e57d..69b6c300 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.135.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.135.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 472068
+                    "lo": 719176
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 472068
+                    "lo": 719176
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 472068
+                        "lo": 719176
                       }
                     }
                   ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 472168
+                                  "lo": 719276
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 472168
+                            "lo": 719276
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 472168
+                          "lo": 719276
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.136.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.136.json
index 7a5347e0..a3163b8a 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.136.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.136.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 176527
+                    "lo": 342546
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 176527
+                    "lo": 342546
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 176527
+                        "lo": 342546
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 7
+                    "lo": 9
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 176627
+                                  "lo": 342646
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 176627
+                            "lo": 342646
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 176627
+                          "lo": 342646
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 7
+                          "lo": 9
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.137.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.137.json
index 8074897c..b54cb1a7 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.137.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.137.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 421118
+                    "lo": 64710
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 421118
+                    "lo": 64710
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 421118
+                        "lo": 64710
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 10
+                    "lo": 8
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 421218
+                                  "lo": 64810
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 421218
+                            "lo": 64810
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 421218
+                          "lo": 64810
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 10
+                          "lo": 8
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.138.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.138.json
index c8edc164..c0fbab7c 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.138.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.138.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 67130
+                    "lo": 321775
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 67130
+                    "lo": 321775
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 67130
+                        "lo": 321775
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 6
+                    "lo": 10
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 67230
+                                  "lo": 321875
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 67230
+                            "lo": 321875
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 67230
+                          "lo": 321875
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 6
+                          "lo": 10
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.139.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.139.json
index 83b35b34..d7dd7c79 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.139.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.139.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 372228
+                    "lo": 746484
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 372228
+                    "lo": 746484
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 372228
+                        "lo": 746484
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 7
+                    "lo": 3
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 372328
+                                  "lo": 746584
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 372328
+                            "lo": 746584
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 372328
+                          "lo": 746584
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 7
+                          "lo": 3
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.14.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.14.json
index b70d01c6..93f14dea 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.14.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.14.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 200884
+                    "lo": 819843
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 200884
+                    "lo": 819843
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 200884
+                        "lo": 819843
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 6
+                    "lo": 7
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 200984
+                                  "lo": 819943
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 200984
+                            "lo": 819943
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 200984
+                          "lo": 819943
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 6
+                          "lo": 7
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.140.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.140.json
index e0c8b716..b59b78a8 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.140.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.140.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 480653
+                    "lo": 234725
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 480653
+                    "lo": 234725
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 480653
+                        "lo": 234725
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 7
+                    "lo": 8
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 480753
+                                  "lo": 234825
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 480753
+                            "lo": 234825
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 480753
+                          "lo": 234825
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 7
+                          "lo": 8
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.141.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.141.json
index f0589106..ad795fca 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.141.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.141.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 855381
+                    "lo": 432285
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 855381
+                    "lo": 432285
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 855381
+                        "lo": 432285
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 3
+                    "lo": 8
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 855481
+                                  "lo": 432385
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 855481
+                            "lo": 432385
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 855481
+                          "lo": 432385
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 3
+                          "lo": 8
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.142.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.142.json
index 19f8d5e8..7aaf02cf 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.142.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.142.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 927678
+                    "lo": 147409
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 927678
+                    "lo": 147409
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 927678
+                        "lo": 147409
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 1
+                    "lo": 6
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 927778
+                                  "lo": 147509
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 927778
+                            "lo": 147509
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 927778
+                          "lo": 147509
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 1
+                          "lo": 6
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.143.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.143.json
index 04b4ef46..dd4ee096 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.143.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.143.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 26335
+                    "lo": 114155
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 26335
+                    "lo": 114155
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 26335
+                        "lo": 114155
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 8
+                    "lo": 1
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 26435
+                                  "lo": 114255
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 26435
+                            "lo": 114255
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 26435
+                          "lo": 114255
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 8
+                          "lo": 1
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.144.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.144.json
index 9abd16ab..f809ce59 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.144.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.144.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 883892
+                    "lo": 880812
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 883892
+                    "lo": 880812
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 883892
+                        "lo": 880812
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 2
+                    "lo": 6
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 883992
+                                  "lo": 880912
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 883992
+                            "lo": 880912
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 883992
+                          "lo": 880912
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 2
+                          "lo": 6
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.145.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.145.json
index 1ed11353..28b48032 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.145.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.145.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 428490
+                    "lo": 912510
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 428490
+                    "lo": 912510
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 428490
+                        "lo": 912510
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 5
+                    "lo": 2
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 428590
+                                  "lo": 912610
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 428590
+                            "lo": 912610
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 428590
+                          "lo": 912610
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 5
+                          "lo": 2
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.146.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.146.json
index ba066e5a..39eb48c6 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.146.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.146.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 115348
+                    "lo": 542619
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 115348
+                    "lo": 542619
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 115348
+                        "lo": 542619
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 2
+                    "lo": 6
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 115448
+                                  "lo": 542719
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 115448
+                            "lo": 542719
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 115448
+                          "lo": 542719
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 2
+                          "lo": 6
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.147.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.147.json
index 72d8fecd..ded76667 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.147.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.147.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 728183
+                    "lo": 85275
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 728183
+                    "lo": 85275
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 728183
+                        "lo": 85275
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 6
+                    "lo": 3
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 728283
+                                  "lo": 85375
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 728283
+                            "lo": 85375
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 728283
+                          "lo": 85375
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 6
+                          "lo": 3
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.148.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.148.json
index 2e83f93f..d04b6a0c 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.148.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.148.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 36990
+                    "lo": 170256
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 36990
+                    "lo": 170256
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 36990
+                        "lo": 170256
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 1
+                    "lo": 3
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 37090
+                                  "lo": 170356
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 37090
+                            "lo": 170356
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 37090
+                          "lo": 170356
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 1
+                          "lo": 3
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.149.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.149.json
index 163c115e..69ba598f 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.149.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.149.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 678889
+                    "lo": 540347
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 678889
+                    "lo": 540347
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 678889
+                        "lo": 540347
                       }
                     }
                   ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 678989
+                                  "lo": 540447
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 678989
+                            "lo": 540447
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 678989
+                          "lo": 540447
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.15.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.15.json
index ce082bf0..6fda4d1e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.15.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.15.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 481701
+                    "lo": 693695
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 481701
+                    "lo": 693695
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 481701
+                        "lo": 693695
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 4
+                    "lo": 10
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 481801
+                                  "lo": 693795
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 481801
+                            "lo": 693795
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 481801
+                          "lo": 693795
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 4
+                          "lo": 10
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.150.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.150.json
index 113c0c8f..a71ddf62 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.150.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.150.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 355735
+                    "lo": 710258
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 355735
+                    "lo": 710258
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 355735
+                        "lo": 710258
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 9
+                    "lo": 1
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 355835
+                                  "lo": 710358
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 355835
+                            "lo": 710358
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 355835
+                          "lo": 710358
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 9
+                          "lo": 1
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.151.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.151.json
index 6ff8791e..895a64b8 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.151.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.151.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 995147
+                    "lo": 81581
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 995147
+                    "lo": 81581
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 995147
+                        "lo": 81581
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 4
+                    "lo": 5
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 995247
+                                  "lo": 81681
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 995247
+                            "lo": 81681
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 995247
+                          "lo": 81681
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 4
+                          "lo": 5
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.152.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.152.json
index c8377dfd..ebae5d00 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.152.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.152.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 188189
+                    "lo": 850605
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 188189
+                    "lo": 850605
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 188189
+                        "lo": 850605
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 6
+                    "lo": 8
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 188289
+                                  "lo": 850705
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 188289
+                            "lo": 850705
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 188289
+                          "lo": 850705
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 6
+                          "lo": 8
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.153.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.153.json
index 30f9a668..f3f67a79 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.153.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.153.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 486269
+                    "lo": 738503
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 486269
+                    "lo": 738503
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 486269
+                        "lo": 738503
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 3
+                    "lo": 10
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 486369
+                                  "lo": 738603
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 486369
+                            "lo": 738603
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 486369
+                          "lo": 738603
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 3
+                          "lo": 10
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.154.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.154.json
index d2875ac6..e0ef0d47 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.154.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.154.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 469977
+                    "lo": 446849
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 469977
+                    "lo": 446849
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 469977
+                        "lo": 446849
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 6
+                    "lo": 8
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 470077
+                                  "lo": 446949
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 470077
+                            "lo": 446949
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 470077
+                          "lo": 446949
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 6
+                          "lo": 8
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.155.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.155.json
index 02266ac0..c62b3044 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.155.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.155.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 661664
+                    "lo": 675142
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 661664
+                    "lo": 675142
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 661664
+                        "lo": 675142
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 7
+                    "lo": 2
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 661764
+                                  "lo": 675242
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 661764
+                            "lo": 675242
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 661764
+                          "lo": 675242
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 7
+                          "lo": 2
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.156.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.156.json
index 7484c9a1..2f6176e1 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.156.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.156.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 620853
+                    "lo": 313249
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 620853
+                    "lo": 313249
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 620853
+                        "lo": 313249
                       }
                     }
                   ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 620953
+                                  "lo": 313349
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 620953
+                            "lo": 313349
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 620953
+                          "lo": 313349
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.157.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.157.json
index 6dd7e455..eeeeaf01 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.157.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.157.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 506304
+                    "lo": 456977
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 506304
+                    "lo": 456977
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 506304
+                        "lo": 456977
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 9
+                    "lo": 10
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 506404
+                                  "lo": 457077
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 506404
+                            "lo": 457077
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 506404
+                          "lo": 457077
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 9
+                          "lo": 10
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.158.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.158.json
index 6ec4592c..06705508 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.158.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.158.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 306519
+                    "lo": 197879
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 306519
+                    "lo": 197879
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 306519
+                        "lo": 197879
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 4
+                    "lo": 2
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 306619
+                                  "lo": 197979
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 306619
+                            "lo": 197979
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 306619
+                          "lo": 197979
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 4
+                          "lo": 2
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.159.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.159.json
index f8fc2d62..02b2295b 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.159.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.159.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 605589
+                    "lo": 694757
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 605589
+                    "lo": 694757
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 605589
+                        "lo": 694757
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 8
+                    "lo": 4
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 605689
+                                  "lo": 694857
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 605689
+                            "lo": 694857
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 605689
+                          "lo": 694857
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 8
+                          "lo": 4
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.16.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.16.json
index 65c34cda..92f7deaa 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.16.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.16.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 279365
+                    "lo": 23681
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 279365
+                    "lo": 23681
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 279365
+                        "lo": 23681
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 2
+                    "lo": 8
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 279465
+                                  "lo": 23781
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 279465
+                            "lo": 23781
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 279465
+                          "lo": 23781
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 2
+                          "lo": 8
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.160.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.160.json
index 1d6a2303..d33929d7 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.160.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.160.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 834512
+                    "lo": 895124
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 834512
+                    "lo": 895124
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 834512
+                        "lo": 895124
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 7
+                    "lo": 5
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 834612
+                                  "lo": 895224
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 834612
+                            "lo": 895224
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 834612
+                          "lo": 895224
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 7
+                          "lo": 5
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.161.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.161.json
index 75e08ebd..585d78c5 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.161.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.161.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 537471
+                    "lo": 747186
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 537471
+                    "lo": 747186
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 537471
+                        "lo": 747186
                       }
                     }
                   ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 537571
+                                  "lo": 747286
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 537571
+                            "lo": 747286
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 537571
+                          "lo": 747286
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.162.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.162.json
index 0edb96e8..212608e2 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.162.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.162.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 598648
+                    "lo": 568844
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 598648
+                    "lo": 568844
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 598648
+                        "lo": 568844
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 1
+                    "lo": 7
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 598748
+                                  "lo": 568944
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 598748
+                            "lo": 568944
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 598748
+                          "lo": 568944
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 1
+                          "lo": 7
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.163.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.163.json
index 74dd7667..cb060ef5 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.163.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.163.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 857693
+                    "lo": 504735
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 857693
+                    "lo": 504735
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 857693
+                        "lo": 504735
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 2
+                    "lo": 1
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 857793
+                                  "lo": 504835
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 857793
+                            "lo": 504835
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 857793
+                          "lo": 504835
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 2
+                          "lo": 1
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.164.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.164.json
index 7a484688..a03c3d40 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.164.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.164.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 950799
+                    "lo": 165882
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 950799
+                    "lo": 165882
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 950799
+                        "lo": 165882
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 10
+                    "lo": 2
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 950899
+                                  "lo": 165982
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 950899
+                            "lo": 165982
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 950899
+                          "lo": 165982
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 10
+                          "lo": 2
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.165.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.165.json
index ce8727ff..b78cc0b8 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.165.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.165.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 109373
+                    "lo": 727179
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 109373
+                    "lo": 727179
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 109373
+                        "lo": 727179
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 9
+                    "lo": 3
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 109473
+                                  "lo": 727279
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 109473
+                            "lo": 727279
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 109473
+                          "lo": 727279
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 9
+                          "lo": 3
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.166.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.166.json
index adac0afa..62003577 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.166.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.166.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 30491
+                    "lo": 850978
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 30491
+                    "lo": 850978
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 30491
+                        "lo": 850978
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 6
+                    "lo": 2
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 30591
+                                  "lo": 851078
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 30591
+                            "lo": 851078
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 30591
+                          "lo": 851078
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 6
+                          "lo": 2
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.167.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.167.json
index 96f26764..1112297d 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.167.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.167.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 271513
+                    "lo": 930237
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 271513
+                    "lo": 930237
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 271513
+                        "lo": 930237
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 8
+                    "lo": 4
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 271613
+                                  "lo": 930337
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 271613
+                            "lo": 930337
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 271613
+                          "lo": 930337
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 8
+                          "lo": 4
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.168.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.168.json
index 3a0d67cd..0825a348 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.168.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.168.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 233096
+                    "lo": 122017
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 233096
+                    "lo": 122017
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 233096
+                        "lo": 122017
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 1
+                    "lo": 6
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 233196
+                                  "lo": 122117
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 233196
+                            "lo": 122117
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 233196
+                          "lo": 122117
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 1
+                          "lo": 6
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.169.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.169.json
index 9bbef731..5f8a3613 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.169.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.169.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 976199
+                    "lo": 19359
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 976199
+                    "lo": 19359
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 976199
+                        "lo": 19359
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 8
+                    "lo": 9
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 976299
+                                  "lo": 19459
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 976299
+                            "lo": 19459
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 976299
+                          "lo": 19459
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 8
+                          "lo": 9
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.17.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.17.json
index b21fb5cd..898491bb 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.17.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.17.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 244807
+                    "lo": 862004
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 244807
+                    "lo": 862004
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 244807
+                        "lo": 862004
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 8
+                    "lo": 6
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 244907
+                                  "lo": 862104
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 244907
+                            "lo": 862104
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 244907
+                          "lo": 862104
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 8
+                          "lo": 6
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.170.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.170.json
index c12f8557..cb01eb72 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.170.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.170.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 641924
+                    "lo": 794527
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 641924
+                    "lo": 794527
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 641924
+                        "lo": 794527
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 5
+                    "lo": 2
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 642024
+                                  "lo": 794627
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 642024
+                            "lo": 794627
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 642024
+                          "lo": 794627
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 5
+                          "lo": 2
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.171.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.171.json
index f0800a9d..0300e84e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.171.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.171.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 220236
+                    "lo": 500365
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 220236
+                    "lo": 500365
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 220236
+                        "lo": 500365
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 6
+                    "lo": 5
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 220336
+                                  "lo": 500465
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 220336
+                            "lo": 500465
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 220336
+                          "lo": 500465
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 6
+                          "lo": 5
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.172.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.172.json
index 84ffb018..28997bf6 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.172.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.172.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 465901
+                    "lo": 78556
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 465901
+                    "lo": 78556
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 465901
+                        "lo": 78556
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 5
+                    "lo": 3
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 466001
+                                  "lo": 78656
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 466001
+                            "lo": 78656
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 466001
+                          "lo": 78656
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 5
+                          "lo": 3
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.173.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.173.json
index ec026b53..2d0f8340 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.173.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.173.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 416309
+                    "lo": 656012
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 416309
+                    "lo": 656012
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 416309
+                        "lo": 656012
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 1
+                    "lo": 5
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 416409
+                                  "lo": 656112
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 416409
+                            "lo": 656112
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 416409
+                          "lo": 656112
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 1
+                          "lo": 5
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.174.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.174.json
index 0112efb7..20b9d877 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.174.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.174.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 23656
+                    "lo": 716067
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 23656
+                    "lo": 716067
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 23656
+                        "lo": 716067
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 9
+                    "lo": 5
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 23756
+                                  "lo": 716167
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 23756
+                            "lo": 716167
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 23756
+                          "lo": 716167
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 9
+                          "lo": 5
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.175.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.175.json
index 075a6727..d16b8652 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.175.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.175.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 979947
+                    "lo": 583953
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 979947
+                    "lo": 583953
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 979947
+                        "lo": 583953
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 7
+                    "lo": 6
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 980047
+                                  "lo": 584053
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 980047
+                            "lo": 584053
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 980047
+                          "lo": 584053
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 7
+                          "lo": 6
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.176.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.176.json
index 35551f33..0e38a8f8 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.176.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.176.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 629076
+                    "lo": 648654
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 629076
+                    "lo": 648654
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 629076
+                        "lo": 648654
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 2
+                    "lo": 9
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 629176
+                                  "lo": 648754
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 629176
+                            "lo": 648754
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 629176
+                          "lo": 648754
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 2
+                          "lo": 9
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.177.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.177.json
index a70a20c3..1aab5b2f 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.177.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.177.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 556490
+                    "lo": 299149
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 556490
+                    "lo": 299149
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 556490
+                        "lo": 299149
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 5
+                    "lo": 2
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 556590
+                                  "lo": 299249
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 556590
+                            "lo": 299249
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 556590
+                          "lo": 299249
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 5
+                          "lo": 2
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.178.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.178.json
index 618d4f05..d7569368 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.178.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.178.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 835770
+                    "lo": 747174
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 835770
+                    "lo": 747174
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 835770
+                        "lo": 747174
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 4
+                    "lo": 1
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 835870
+                                  "lo": 747274
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 835870
+                            "lo": 747274
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 835870
+                          "lo": 747274
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 4
+                          "lo": 1
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.179.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.179.json
index 921938ec..1c688e75 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.179.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.179.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 332469
+                    "lo": 49378
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 332469
+                    "lo": 49378
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 332469
+                        "lo": 49378
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 10
+                    "lo": 4
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 332569
+                                  "lo": 49478
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 332569
+                            "lo": 49478
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 332569
+                          "lo": 49478
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 10
+                          "lo": 4
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.18.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.18.json
index c3cd3360..1ad502a2 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.18.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.18.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 808687
+                    "lo": 504359
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 808687
+                    "lo": 504359
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 808687
+                        "lo": 504359
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 9
+                    "lo": 2
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 808787
+                                  "lo": 504459
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 808787
+                            "lo": 504459
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 808787
+                          "lo": 504459
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 9
+                          "lo": 2
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.180.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.180.json
index acc79d84..ec4cfb71 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.180.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.180.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 526839
+                    "lo": 826109
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 526839
+                    "lo": 826109
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 526839
+                        "lo": 826109
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 9
+                    "lo": 10
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 526939
+                                  "lo": 826209
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 526939
+                            "lo": 826209
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 526939
+                          "lo": 826209
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 9
+                          "lo": 10
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.181.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.181.json
index c6a8f461..43045265 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.181.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.181.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 207197
+                    "lo": 732417
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 207197
+                    "lo": 732417
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 207197
+                        "lo": 732417
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 9
+                    "lo": 4
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 207297
+                                  "lo": 732517
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 207297
+                            "lo": 732517
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 207297
+                          "lo": 732517
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 9
+                          "lo": 4
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.182.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.182.json
index dc37b7d7..a530a854 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.182.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.182.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 218357
+                    "lo": 622665
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 218357
+                    "lo": 622665
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 218357
+                        "lo": 622665
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 3
+                    "lo": 8
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 218457
+                                  "lo": 622765
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 218457
+                            "lo": 622765
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 218457
+                          "lo": 622765
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 3
+                          "lo": 8
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.183.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.183.json
index 67fb0be5..7885d2d1 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.183.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.183.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 101126
+                    "lo": 455777
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 101126
+                    "lo": 455777
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 101126
+                        "lo": 455777
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 3
+                    "lo": 2
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 101226
+                                  "lo": 455877
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 101226
+                            "lo": 455877
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 101226
+                          "lo": 455877
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 3
+                          "lo": 2
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.184.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.184.json
index d85e54cc..a9cac4ce 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.184.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.184.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 399793
+                    "lo": 20849
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 399793
+                    "lo": 20849
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 399793
+                        "lo": 20849
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 9
+                    "lo": 10
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 399893
+                                  "lo": 20949
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 399893
+                            "lo": 20949
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 399893
+                          "lo": 20949
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 9
+                          "lo": 10
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.185.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.185.json
index 11c5ea26..6b8cff87 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.185.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.185.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 877845
+                    "lo": 397731
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 877845
+                    "lo": 397731
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 877845
+                        "lo": 397731
                       }
                     }
                   ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 877945
+                                  "lo": 397831
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 877945
+                            "lo": 397831
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 877945
+                          "lo": 397831
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.186.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.186.json
index d3ec2449..f1359226 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.186.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.186.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 212917
+                    "lo": 895003
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 212917
+                    "lo": 895003
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 212917
+                        "lo": 895003
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 3
+                    "lo": 7
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 213017
+                                  "lo": 895103
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 213017
+                            "lo": 895103
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 213017
+                          "lo": 895103
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 3
+                          "lo": 7
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.187.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.187.json
index 04a565d9..c270122a 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.187.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.187.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 89405
+                    "lo": 441832
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 89405
+                    "lo": 441832
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 89405
+                        "lo": 441832
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 6
+                    "lo": 7
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 89505
+                                  "lo": 441932
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 89505
+                            "lo": 441932
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 89505
+                          "lo": 441932
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 6
+                          "lo": 7
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.188.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.188.json
index ddda0abc..03b64833 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.188.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.188.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 174913
+                    "lo": 613851
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 174913
+                    "lo": 613851
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 174913
+                        "lo": 613851
                       }
                     }
                   ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 175013
+                                  "lo": 613951
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 175013
+                            "lo": 613951
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 175013
+                          "lo": 613951
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.189.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.189.json
index dacc5c3b..10f3402d 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.189.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.189.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 477479
+                    "lo": 930796
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 477479
+                    "lo": 930796
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 477479
+                        "lo": 930796
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 6
+                    "lo": 5
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 477579
+                                  "lo": 930896
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 477579
+                            "lo": 930896
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 477579
+                          "lo": 930896
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 6
+                          "lo": 5
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.19.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.19.json
index 93e2c937..9d969d89 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.19.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.19.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 534649
+                    "lo": 796766
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 534649
+                    "lo": 796766
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 534649
+                        "lo": 796766
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 8
+                    "lo": 3
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 534749
+                                  "lo": 796866
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 534749
+                            "lo": 796866
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 534749
+                          "lo": 796866
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 8
+                          "lo": 3
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.190.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.190.json
index 7ba3b04b..55196f00 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.190.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.190.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 865144
+                    "lo": 796715
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 865144
+                    "lo": 796715
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 865144
+                        "lo": 796715
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 8
+                    "lo": 1
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 865244
+                                  "lo": 796815
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 865244
+                            "lo": 796815
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 865244
+                          "lo": 796815
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 8
+                          "lo": 1
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.191.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.191.json
index 68604a80..79e89c8c 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.191.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.191.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 20428
+                    "lo": 413058
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 20428
+                    "lo": 413058
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 20428
+                        "lo": 413058
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 7
+                    "lo": 8
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 20528
+                                  "lo": 413158
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 20528
+                            "lo": 413158
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 20528
+                          "lo": 413158
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 7
+                          "lo": 8
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.192.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.192.json
index e5e5aac4..4b2904c9 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.192.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.192.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 979115
+                    "lo": 546348
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 979115
+                    "lo": 546348
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 979115
+                        "lo": 546348
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 10
+                    "lo": 6
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 979215
+                                  "lo": 546448
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 979215
+                            "lo": 546448
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 979215
+                          "lo": 546448
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 10
+                          "lo": 6
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.193.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.193.json
index dcfb6b94..93fad45f 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.193.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.193.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 529265
+                    "lo": 844288
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 529265
+                    "lo": 844288
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 529265
+                        "lo": 844288
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 3
+                    "lo": 9
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 529365
+                                  "lo": 844388
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 529365
+                            "lo": 844388
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 529365
+                          "lo": 844388
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 3
+                          "lo": 9
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.194.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.194.json
index 4233444f..bc54da5a 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.194.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.194.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 19636
+                    "lo": 640299
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 19636
+                    "lo": 640299
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 19636
+                        "lo": 640299
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 10
+                    "lo": 3
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 19736
+                                  "lo": 640399
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 19736
+                            "lo": 640399
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 19736
+                          "lo": 640399
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 10
+                          "lo": 3
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.195.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.195.json
index e6e586d6..1a5c10b7 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.195.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.195.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 929807
+                    "lo": 897883
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 929807
+                    "lo": 897883
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 929807
+                        "lo": 897883
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 6
+                    "lo": 5
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 929907
+                                  "lo": 897983
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 929907
+                            "lo": 897983
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 929907
+                          "lo": 897983
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 6
+                          "lo": 5
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.196.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.196.json
index 02e62cd5..54e476ac 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.196.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.196.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 771423
+                    "lo": 883167
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 771423
+                    "lo": 883167
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 771423
+                        "lo": 883167
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 4
+                    "lo": 3
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 771523
+                                  "lo": 883267
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 771523
+                            "lo": 883267
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 771523
+                          "lo": 883267
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 4
+                          "lo": 3
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.197.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.197.json
index 438943c1..f56fc719 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.197.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.197.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 17626
+                    "lo": 256854
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 17626
+                    "lo": 256854
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 17626
+                        "lo": 256854
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 10
+                    "lo": 9
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 17726
+                                  "lo": 256954
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 17726
+                            "lo": 256954
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 17726
+                          "lo": 256954
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 10
+                          "lo": 9
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.198.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.198.json
index 8256b50c..1a9c15ba 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.198.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.198.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 511853
+                    "lo": 446073
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 511853
+                    "lo": 446073
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 511853
+                        "lo": 446073
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 2
+                    "lo": 3
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 511953
+                                  "lo": 446173
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 511953
+                            "lo": 446173
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 511953
+                          "lo": 446173
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 2
+                          "lo": 3
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.199.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.199.json
index cf9ce04a..62de8a46 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.199.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.199.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 919103
+                    "lo": 536644
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 919103
+                    "lo": 536644
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 919103
+                        "lo": 536644
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 2
+                    "lo": 9
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 919203
+                                  "lo": 536744
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 919203
+                            "lo": 536744
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 919203
+                          "lo": 536744
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 2
+                          "lo": 9
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.2.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.2.json
index 1ed849d6..7c0b9edb 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.2.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.2.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 112605
+                    "lo": 915410
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 112605
+                    "lo": 915410
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 112605
+                        "lo": 915410
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 8
+                    "lo": 4
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 112705
+                                  "lo": 915510
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 112705
+                            "lo": 915510
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 112705
+                          "lo": 915510
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 8
+                          "lo": 4
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.20.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.20.json
index 766c8068..8cb54730 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.20.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.20.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 249127
+                    "lo": 288586
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 249127
+                    "lo": 288586
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 249127
+                        "lo": 288586
                       }
                     }
                   ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 249227
+                                  "lo": 288686
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 249227
+                            "lo": 288686
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 249227
+                          "lo": 288686
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.200.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.200.json
index b0cdc06d..2dc7f5a5 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.200.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.200.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 895523
+                    "lo": 456421
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 895523
+                    "lo": 456421
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 895523
+                        "lo": 456421
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 8
+                    "lo": 7
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 895623
+                                  "lo": 456521
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 895623
+                            "lo": 456521
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 895623
+                          "lo": 456521
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 8
+                          "lo": 7
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.201.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.201.json
index 37a79c4c..631bf835 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.201.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.201.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 894002
+                    "lo": 915268
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 894002
+                    "lo": 915268
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 894002
+                        "lo": 915268
                       }
                     }
                   ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 894102
+                                  "lo": 915368
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 894102
+                            "lo": 915368
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 894102
+                          "lo": 915368
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.202.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.202.json
index 37fa180c..bd0aab62 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.202.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.202.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 197192
+                    "lo": 340604
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 197192
+                    "lo": 340604
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 197192
+                        "lo": 340604
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 6
+                    "lo": 3
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 197292
+                                  "lo": 340704
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 197292
+                            "lo": 340704
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 197292
+                          "lo": 340704
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 6
+                          "lo": 3
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.203.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.203.json
index 98ef4b31..b6b99801 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.203.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.203.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 882622
+                    "lo": 867218
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 882622
+                    "lo": 867218
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 882622
+                        "lo": 867218
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 6
+                    "lo": 7
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 882722
+                                  "lo": 867318
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 882722
+                            "lo": 867318
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 882722
+                          "lo": 867318
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 6
+                          "lo": 7
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.204.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.204.json
index 84736434..16f6116c 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.204.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.204.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 265279
+                    "lo": 635495
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 265279
+                    "lo": 635495
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 265279
+                        "lo": 635495
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 4
+                    "lo": 8
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 265379
+                                  "lo": 635595
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 265379
+                            "lo": 635595
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 265379
+                          "lo": 635595
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 4
+                          "lo": 8
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.205.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.205.json
index 4786191d..0a9bdbde 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.205.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.205.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 477747
+                    "lo": 212151
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 477747
+                    "lo": 212151
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 477747
+                        "lo": 212151
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 2
+                    "lo": 8
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 477847
+                                  "lo": 212251
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 477847
+                            "lo": 212251
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 477847
+                          "lo": 212251
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 2
+                          "lo": 8
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.206.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.206.json
index da8b6abd..55ecb8a8 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.206.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.206.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 441362
+                    "lo": 878263
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 441362
+                    "lo": 878263
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 441362
+                        "lo": 878263
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 9
+                    "lo": 6
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 441462
+                                  "lo": 878363
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 441462
+                            "lo": 878363
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 441462
+                          "lo": 878363
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 9
+                          "lo": 6
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.207.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.207.json
index c4d2fe1f..0634474e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.207.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.207.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 774118
+                    "lo": 574884
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 774118
+                    "lo": 574884
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 774118
+                        "lo": 574884
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 2
+                    "lo": 1
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 774218
+                                  "lo": 574984
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 774218
+                            "lo": 574984
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 774218
+                          "lo": 574984
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 2
+                          "lo": 1
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.208.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.208.json
index 3f4952ee..23d4d733 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.208.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.208.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 736676
+                    "lo": 125245
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 736676
+                    "lo": 125245
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 736676
+                        "lo": 125245
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 6
+                    "lo": 8
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 736776
+                                  "lo": 125345
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 736776
+                            "lo": 125345
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 736776
+                          "lo": 125345
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 6
+                          "lo": 8
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.209.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.209.json
index ce5d47dc..b573f392 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.209.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.209.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 378312
+                    "lo": 946294
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 378312
+                    "lo": 946294
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 378312
+                        "lo": 946294
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 9
+                    "lo": 3
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 378412
+                                  "lo": 946394
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 378412
+                            "lo": 946394
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 378412
+                          "lo": 946394
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 9
+                          "lo": 3
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.21.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.21.json
index cc2bfc1d..c3c2b79b 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.21.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.21.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 638291
+                    "lo": 635549
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 638291
+                    "lo": 635549
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 638291
+                        "lo": 635549
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 6
+                    "lo": 2
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 638391
+                                  "lo": 635649
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 638391
+                            "lo": 635649
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 638391
+                          "lo": 635649
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 6
+                          "lo": 2
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.210.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.210.json
index e0817f17..51b5e465 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.210.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.210.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 916640
+                    "lo": 341905
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 916640
+                    "lo": 341905
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 916640
+                        "lo": 341905
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 7
+                    "lo": 9
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 916740
+                                  "lo": 342005
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 916740
+                            "lo": 342005
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 916740
+                          "lo": 342005
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 7
+                          "lo": 9
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.211.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.211.json
index 601023ba..9f8d3429 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.211.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.211.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 790651
+                    "lo": 932549
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 790651
+                    "lo": 932549
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 790651
+                        "lo": 932549
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 1
+                    "lo": 8
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 790751
+                                  "lo": 932649
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 790751
+                            "lo": 932649
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 790751
+                          "lo": 932649
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 1
+                          "lo": 8
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.212.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.212.json
index 06c6614f..af624dfe 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.212.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.212.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 298397
+                    "lo": 569351
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 298397
+                    "lo": 569351
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 298397
+                        "lo": 569351
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 4
+                    "lo": 9
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 298497
+                                  "lo": 569451
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 298497
+                            "lo": 569451
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 298497
+                          "lo": 569451
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 4
+                          "lo": 9
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.213.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.213.json
index 80a30620..b2d8dc0c 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.213.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.213.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 707659
+                    "lo": 793432
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 707659
+                    "lo": 793432
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 707659
+                        "lo": 793432
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 5
+                    "lo": 6
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 707759
+                                  "lo": 793532
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 707759
+                            "lo": 793532
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 707759
+                          "lo": 793532
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 5
+                          "lo": 6
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.214.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.214.json
index ea2da018..74c175af 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.214.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.214.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 568958
+                    "lo": 675810
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 568958
+                    "lo": 675810
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 568958
+                        "lo": 675810
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 6
+                    "lo": 8
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 569058
+                                  "lo": 675910
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 569058
+                            "lo": 675910
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 569058
+                          "lo": 675910
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 6
+                          "lo": 8
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.215.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.215.json
index 7ba301fc..853a7b6e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.215.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.215.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 811600
+                    "lo": 930985
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 811600
+                    "lo": 930985
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 811600
+                        "lo": 930985
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 8
+                    "lo": 1
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 811700
+                                  "lo": 931085
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 811700
+                            "lo": 931085
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 811700
+                          "lo": 931085
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 8
+                          "lo": 1
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.216.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.216.json
index 49366179..48d0da31 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.216.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.216.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 681733
+                    "lo": 718123
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 681733
+                    "lo": 718123
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 681733
+                        "lo": 718123
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 5
+                    "lo": 2
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 681833
+                                  "lo": 718223
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 681833
+                            "lo": 718223
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 681833
+                          "lo": 718223
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 5
+                          "lo": 2
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.217.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.217.json
index 0039bb62..1ea6d642 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.217.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.217.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 389714
+                    "lo": 698943
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 389714
+                    "lo": 698943
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 389714
+                        "lo": 698943
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 3
+                    "lo": 8
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 389814
+                                  "lo": 699043
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 389814
+                            "lo": 699043
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 389814
+                          "lo": 699043
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 3
+                          "lo": 8
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.218.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.218.json
index a7ef804e..d85e8df8 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.218.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.218.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 737460
+                    "lo": 722724
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 737460
+                    "lo": 722724
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 737460
+                        "lo": 722724
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 5
+                    "lo": 10
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 737560
+                                  "lo": 722824
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 737560
+                            "lo": 722824
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 737560
+                          "lo": 722824
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 5
+                          "lo": 10
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.219.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.219.json
index f607eb81..058ae325 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.219.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.219.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 557564
+                    "lo": 194752
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 557564
+                    "lo": 194752
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 557564
+                        "lo": 194752
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 3
+                    "lo": 2
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 557664
+                                  "lo": 194852
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 557664
+                            "lo": 194852
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 557664
+                          "lo": 194852
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 3
+                          "lo": 2
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.22.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.22.json
index 0703307d..52479487 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.22.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.22.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 82461
+                    "lo": 958432
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 82461
+                    "lo": 958432
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 82461
+                        "lo": 958432
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 6
+                    "lo": 4
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 82561
+                                  "lo": 958532
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 82561
+                            "lo": 958532
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 82561
+                          "lo": 958532
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 6
+                          "lo": 4
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.220.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.220.json
index 4d982c2e..32dc6059 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.220.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.220.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 614361
+                    "lo": 247895
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 614361
+                    "lo": 247895
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 614361
+                        "lo": 247895
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 4
+                    "lo": 7
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 614461
+                                  "lo": 247995
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 614461
+                            "lo": 247995
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 614461
+                          "lo": 247995
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 4
+                          "lo": 7
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.221.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.221.json
index 4ad5e82e..44e4446c 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.221.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.221.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 952637
+                    "lo": 903069
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 952637
+                    "lo": 903069
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 952637
+                        "lo": 903069
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 10
+                    "lo": 3
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 952737
+                                  "lo": 903169
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 952737
+                            "lo": 903169
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 952737
+                          "lo": 903169
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 10
+                          "lo": 3
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.222.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.222.json
index 4a09e70a..120a224e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.222.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.222.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 597398
+                    "lo": 784156
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 597398
+                    "lo": 784156
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 597398
+                        "lo": 784156
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 5
+                    "lo": 10
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 597498
+                                  "lo": 784256
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 597498
+                            "lo": 784256
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 597498
+                          "lo": 784256
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 5
+                          "lo": 10
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.223.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.223.json
index 11bed805..d9b506a1 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.223.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.223.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 25421
+                    "lo": 874539
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 25421
+                    "lo": 874539
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 25421
+                        "lo": 874539
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 5
+                    "lo": 6
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 25521
+                                  "lo": 874639
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 25521
+                            "lo": 874639
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 25521
+                          "lo": 874639
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 5
+                          "lo": 6
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.224.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.224.json
index 193c643f..b5c35d24 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.224.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.224.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 434988
+                    "lo": 227314
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 434988
+                    "lo": 227314
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 434988
+                        "lo": 227314
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 2
+                    "lo": 9
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 435088
+                                  "lo": 227414
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 435088
+                            "lo": 227414
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 435088
+                          "lo": 227414
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 2
+                          "lo": 9
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.225.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.225.json
index c4b00837..95ac78bd 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.225.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.225.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 109246
+                    "lo": 725801
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 109246
+                    "lo": 725801
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 109246
+                        "lo": 725801
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 7
+                    "lo": 9
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 109346
+                                  "lo": 725901
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 109346
+                            "lo": 725901
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 109346
+                          "lo": 725901
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 7
+                          "lo": 9
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.226.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.226.json
index 6ab19d0f..44ee357d 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.226.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.226.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 928530
+                    "lo": 796382
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 928530
+                    "lo": 796382
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 928530
+                        "lo": 796382
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 5
+                    "lo": 7
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 928630
+                                  "lo": 796482
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 928630
+                            "lo": 796482
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 928630
+                          "lo": 796482
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 5
+                          "lo": 7
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.227.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.227.json
index 7677cc40..d4263dd9 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.227.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.227.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 509011
+                    "lo": 740142
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 509011
+                    "lo": 740142
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 509011
+                        "lo": 740142
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 8
+                    "lo": 3
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 509111
+                                  "lo": 740242
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 509111
+                            "lo": 740242
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 509111
+                          "lo": 740242
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 8
+                          "lo": 3
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.228.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.228.json
index fba7293d..012ad742 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.228.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.228.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 287300
+                    "lo": 148351
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 287300
+                    "lo": 148351
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 287300
+                        "lo": 148351
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 2
+                    "lo": 10
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 287400
+                                  "lo": 148451
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 287400
+                            "lo": 148451
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 287400
+                          "lo": 148451
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 2
+                          "lo": 10
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.229.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.229.json
index d050663d..1238f22c 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.229.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.229.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 749985
+                    "lo": 852183
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 749985
+                    "lo": 852183
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 749985
+                        "lo": 852183
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 9
+                    "lo": 1
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 750085
+                                  "lo": 852283
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 750085
+                            "lo": 852283
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 750085
+                          "lo": 852283
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 9
+                          "lo": 1
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.23.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.23.json
index a562b5ce..9ee6e0cf 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.23.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.23.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 588403
+                    "lo": 2374
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 588403
+                    "lo": 2374
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 588403
+                        "lo": 2374
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 7
+                    "lo": 1
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 588503
+                                  "lo": 2474
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 588503
+                            "lo": 2474
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 588503
+                          "lo": 2474
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 7
+                          "lo": 1
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.230.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.230.json
index 35f9d6dc..dd33165c 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.230.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.230.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 745359
+                    "lo": 903641
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 745359
+                    "lo": 903641
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 745359
+                        "lo": 903641
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 10
+                    "lo": 6
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 745459
+                                  "lo": 903741
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 745459
+                            "lo": 903741
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 745459
+                          "lo": 903741
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 10
+                          "lo": 6
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.231.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.231.json
index 6ee9ad94..d2f90cab 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.231.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.231.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 975576
+                    "lo": 550518
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 975576
+                    "lo": 550518
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 975576
+                        "lo": 550518
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 6
+                    "lo": 8
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 975676
+                                  "lo": 550618
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 975676
+                            "lo": 550618
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 975676
+                          "lo": 550618
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 6
+                          "lo": 8
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.232.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.232.json
index 29506a1e..5d68af17 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.232.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.232.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 977630
+                    "lo": 532018
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 977630
+                    "lo": 532018
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 977630
+                        "lo": 532018
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 5
+                    "lo": 6
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 977730
+                                  "lo": 532118
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 977730
+                            "lo": 532118
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 977730
+                          "lo": 532118
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 5
+                          "lo": 6
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.233.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.233.json
index 08a35825..52014e21 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.233.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.233.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 568881
+                    "lo": 734341
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 568881
+                    "lo": 734341
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 568881
+                        "lo": 734341
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 3
+                    "lo": 5
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 568981
+                                  "lo": 734441
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 568981
+                            "lo": 734441
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 568981
+                          "lo": 734441
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 3
+                          "lo": 5
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.234.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.234.json
index bc1f84eb..b9486025 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.234.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.234.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 386126
+                    "lo": 335737
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 386126
+                    "lo": 335737
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 386126
+                        "lo": 335737
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 1
+                    "lo": 8
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 386226
+                                  "lo": 335837
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 386226
+                            "lo": 335837
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 386226
+                          "lo": 335837
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 1
+                          "lo": 8
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.235.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.235.json
index bd2c6af1..4da8e1e6 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.235.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.235.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 770291
+                    "lo": 133756
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 770291
+                    "lo": 133756
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 770291
+                        "lo": 133756
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 2
+                    "lo": 3
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 770391
+                                  "lo": 133856
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 770391
+                            "lo": 133856
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 770391
+                          "lo": 133856
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 2
+                          "lo": 3
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.236.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.236.json
index 82137d44..acc6ab64 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.236.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.236.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 343725
+                    "lo": 852496
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 343725
+                    "lo": 852496
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 343725
+                        "lo": 852496
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 10
+                    "lo": 2
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 343825
+                                  "lo": 852596
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 343825
+                            "lo": 852596
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 343825
+                          "lo": 852596
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 10
+                          "lo": 2
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.237.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.237.json
index 6f9eaf2a..a8408fdb 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.237.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.237.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 55844
+                    "lo": 509067
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 55844
+                    "lo": 509067
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 55844
+                        "lo": 509067
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 2
+                    "lo": 6
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 55944
+                                  "lo": 509167
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 55944
+                            "lo": 509167
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 55944
+                          "lo": 509167
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 2
+                          "lo": 6
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.238.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.238.json
index 2205dec7..11b124c6 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.238.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.238.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 386986
+                    "lo": 466641
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 386986
+                    "lo": 466641
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 386986
+                        "lo": 466641
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 10
+                    "lo": 5
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 387086
+                                  "lo": 466741
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 387086
+                            "lo": 466741
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 387086
+                          "lo": 466741
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 10
+                          "lo": 5
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.239.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.239.json
index 26a2b5cf..fbab8cb5 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.239.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.239.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 437137
+                    "lo": 626401
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 437137
+                    "lo": 626401
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 437137
+                        "lo": 626401
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 5
+                    "lo": 4
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 437237
+                                  "lo": 626501
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 437237
+                            "lo": 626501
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 437237
+                          "lo": 626501
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 5
+                          "lo": 4
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.24.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.24.json
index f6a6168e..569dd8fb 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.24.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.24.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 556114
+                    "lo": 661328
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 556114
+                    "lo": 661328
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 556114
+                        "lo": 661328
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 4
+                    "lo": 2
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 556214
+                                  "lo": 661428
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 556214
+                            "lo": 661428
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 556214
+                          "lo": 661428
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 4
+                          "lo": 2
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.240.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.240.json
index 97abb8b2..a215b203 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.240.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.240.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 326743
+                    "lo": 692730
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 326743
+                    "lo": 692730
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 326743
+                        "lo": 692730
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 7
+                    "lo": 8
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 326843
+                                  "lo": 692830
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 326843
+                            "lo": 692830
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 326843
+                          "lo": 692830
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 7
+                          "lo": 8
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.241.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.241.json
index cd617cc2..3c1aa237 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.241.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.241.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 542143
+                    "lo": 299056
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 542143
+                    "lo": 299056
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 542143
+                        "lo": 299056
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 5
+                    "lo": 4
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 542243
+                                  "lo": 299156
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 542243
+                            "lo": 299156
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 542243
+                          "lo": 299156
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 5
+                          "lo": 4
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.242.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.242.json
index 9485a1fa..7d1705fb 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.242.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.242.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 747966
+                    "lo": 752674
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 747966
+                    "lo": 752674
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 747966
+                        "lo": 752674
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 8
+                    "lo": 4
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 748066
+                                  "lo": 752774
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 748066
+                            "lo": 752774
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 748066
+                          "lo": 752774
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 8
+                          "lo": 4
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.243.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.243.json
index 69cc3bff..61b1c933 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.243.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.243.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 612280
+                    "lo": 46147
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 612280
+                    "lo": 46147
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 612280
+                        "lo": 46147
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 10
+                    "lo": 6
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 612380
+                                  "lo": 46247
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 612380
+                            "lo": 46247
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 612380
+                          "lo": 46247
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 10
+                          "lo": 6
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.244.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.244.json
index d8fe351a..41f64d5e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.244.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.244.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 632005
+                    "lo": 776102
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 632005
+                    "lo": 776102
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 632005
+                        "lo": 776102
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 9
+                    "lo": 10
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 632105
+                                  "lo": 776202
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 632105
+                            "lo": 776202
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 632105
+                          "lo": 776202
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 9
+                          "lo": 10
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.245.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.245.json
index 1391fc84..866efc2d 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.245.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.245.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 724866
+                    "lo": 212473
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 724866
+                    "lo": 212473
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 724866
+                        "lo": 212473
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 10
+                    "lo": 2
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 724966
+                                  "lo": 212573
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 724966
+                            "lo": 212573
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 724966
+                          "lo": 212573
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 10
+                          "lo": 2
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.246.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.246.json
index 15dd3840..a772fa38 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.246.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.246.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 891746
+                    "lo": 424535
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 891746
+                    "lo": 424535
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 891746
+                        "lo": 424535
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 2
+                    "lo": 4
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 891846
+                                  "lo": 424635
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 891846
+                            "lo": 424635
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 891846
+                          "lo": 424635
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 2
+                          "lo": 4
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.247.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.247.json
index c1c288db..f7708d7b 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.247.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.247.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 851082
+                    "lo": 300767
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 851082
+                    "lo": 300767
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 851082
+                        "lo": 300767
                       }
                     }
                   ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 851182
+                                  "lo": 300867
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 851182
+                            "lo": 300867
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 851182
+                          "lo": 300867
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.248.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.248.json
index be8a8584..981392de 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.248.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.248.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 196308
+                    "lo": 516160
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 196308
+                    "lo": 516160
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 196308
+                        "lo": 516160
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 5
+                    "lo": 2
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 196408
+                                  "lo": 516260
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 196408
+                            "lo": 516260
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 196408
+                          "lo": 516260
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 5
+                          "lo": 2
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.249.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.249.json
index db35ebb7..62aef68d 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.249.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.249.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 500027
+                    "lo": 363762
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 500027
+                    "lo": 363762
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 500027
+                        "lo": 363762
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 10
+                    "lo": 4
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 500127
+                                  "lo": 363862
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 500127
+                            "lo": 363862
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 500127
+                          "lo": 363862
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 10
+                          "lo": 4
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.25.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.25.json
index 91a32f9d..06dc1aa4 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.25.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.25.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 594372
+                    "lo": 4269
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 594372
+                    "lo": 4269
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 594372
+                        "lo": 4269
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 7
+                    "lo": 5
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 594472
+                                  "lo": 4369
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 594472
+                            "lo": 4369
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 594472
+                          "lo": 4369
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 7
+                          "lo": 5
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.250.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.250.json
index 1ffa8885..e306bced 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.250.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.250.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 19499
+                    "lo": 360956
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 19499
+                    "lo": 360956
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 19499
+                        "lo": 360956
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 9
+                    "lo": 2
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 19599
+                                  "lo": 361056
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 19599
+                            "lo": 361056
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 19599
+                          "lo": 361056
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 9
+                          "lo": 2
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.251.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.251.json
index cf1a4237..870cc7d0 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.251.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.251.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 706623
+                    "lo": 217196
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 706623
+                    "lo": 217196
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 706623
+                        "lo": 217196
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 7
+                    "lo": 1
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 706723
+                                  "lo": 217296
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 706723
+                            "lo": 217296
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 706723
+                          "lo": 217296
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 7
+                          "lo": 1
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.252.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.252.json
index 5ef2679b..663007e6 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.252.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.252.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 286979
+                    "lo": 196862
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 286979
+                    "lo": 196862
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 286979
+                        "lo": 196862
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 4
+                    "lo": 9
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 287079
+                                  "lo": 196962
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 287079
+                            "lo": 196962
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 287079
+                          "lo": 196962
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 4
+                          "lo": 9
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.253.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.253.json
index 0c626558..978d3c3b 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.253.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.253.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 332776
+                    "lo": 387651
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 332776
+                    "lo": 387651
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 332776
+                        "lo": 387651
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 1
+                    "lo": 9
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 332876
+                                  "lo": 387751
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 332876
+                            "lo": 387751
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 332876
+                          "lo": 387751
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 1
+                          "lo": 9
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.254.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.254.json
index 35782b90..c7ab8384 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.254.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.254.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 992755
+                    "lo": 3836
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 992755
+                    "lo": 3836
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 992755
+                        "lo": 3836
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 8
+                    "lo": 9
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 992855
+                                  "lo": 3936
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 992855
+                            "lo": 3936
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 992855
+                          "lo": 3936
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 8
+                          "lo": 9
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.255.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.255.json
index f8e7d0c5..035cddd9 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.255.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.255.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 142257
+                    "lo": 35307
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 142257
+                    "lo": 35307
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 142257
+                        "lo": 35307
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 6
+                    "lo": 10
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 142357
+                                  "lo": 35407
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 142357
+                            "lo": 35407
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 142357
+                          "lo": 35407
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 6
+                          "lo": 10
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.256.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.256.json
index c91801b0..1fea1791 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.256.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.256.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 769454
+                    "lo": 944875
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 769454
+                    "lo": 944875
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 769454
+                        "lo": 944875
                       }
                     }
                   ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 769554
+                                  "lo": 944975
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 769554
+                            "lo": 944975
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 769554
+                          "lo": 944975
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.257.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.257.json
index d4d588be..52daa05c 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.257.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.257.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 305806
+                    "lo": 15756
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 305806
+                    "lo": 15756
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 305806
+                        "lo": 15756
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 7
+                    "lo": 1
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 305906
+                                  "lo": 15856
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 305906
+                            "lo": 15856
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 305906
+                          "lo": 15856
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 7
+                          "lo": 1
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.26.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.26.json
index 3f71433c..42ff2cac 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.26.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.26.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 723426
+                    "lo": 420062
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 723426
+                    "lo": 420062
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 723426
+                        "lo": 420062
                       }
                     }
                   ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 723526
+                                  "lo": 420162
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 723526
+                            "lo": 420162
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 723526
+                          "lo": 420162
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.27.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.27.json
index 7f6a815a..2a810191 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.27.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.27.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 843138
+                    "lo": 856895
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 843138
+                    "lo": 856895
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 843138
+                        "lo": 856895
                       }
                     }
                   ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 843238
+                                  "lo": 856995
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 843238
+                            "lo": 856995
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 843238
+                          "lo": 856995
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.28.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.28.json
index fb0d5286..5e71bd66 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.28.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.28.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 907958
+                    "lo": 856837
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 907958
+                    "lo": 856837
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 907958
+                        "lo": 856837
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 9
+                    "lo": 6
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 908058
+                                  "lo": 856937
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 908058
+                            "lo": 856937
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 908058
+                          "lo": 856937
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 9
+                          "lo": 6
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.29.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.29.json
index 9219692a..e4805ebd 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.29.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.29.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 957433
+                    "lo": 947644
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 957433
+                    "lo": 947644
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 957433
+                        "lo": 947644
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 1
+                    "lo": 5
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 957533
+                                  "lo": 947744
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 957533
+                            "lo": 947744
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 957533
+                          "lo": 947744
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 1
+                          "lo": 5
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.3.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.3.json
index ffe65037..5fe76820 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.3.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.3.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 151267
+                    "lo": 223416
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 151267
+                    "lo": 223416
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 151267
+                        "lo": 223416
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 8
+                    "lo": 10
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 151367
+                                  "lo": 223516
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 151367
+                            "lo": 223516
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 151367
+                          "lo": 223516
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 8
+                          "lo": 10
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.30.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.30.json
index f0c437ed..9f8056a8 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.30.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.30.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 207398
+                    "lo": 385150
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 207398
+                    "lo": 385150
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 207398
+                        "lo": 385150
                       }
                     }
                   ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 207498
+                                  "lo": 385250
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 207498
+                            "lo": 385250
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 207498
+                          "lo": 385250
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.31.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.31.json
index 12bb47f6..30c2722e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.31.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.31.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 956975
+                    "lo": 56127
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 956975
+                    "lo": 56127
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 956975
+                        "lo": 56127
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 1
+                    "lo": 10
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 957075
+                                  "lo": 56227
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 957075
+                            "lo": 56227
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 957075
+                          "lo": 56227
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 1
+                          "lo": 10
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.32.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.32.json
index 8a8ad642..52f92d25 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.32.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.32.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 11936
+                    "lo": 664205
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 11936
+                    "lo": 664205
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 11936
+                        "lo": 664205
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 9
+                    "lo": 3
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 12036
+                                  "lo": 664305
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 12036
+                            "lo": 664305
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 12036
+                          "lo": 664305
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 9
+                          "lo": 3
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.33.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.33.json
index 04311126..b0269481 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.33.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.33.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 147019
+                    "lo": 267049
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 147019
+                    "lo": 267049
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 147019
+                        "lo": 267049
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 1
+                    "lo": 7
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 147119
+                                  "lo": 267149
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 147119
+                            "lo": 267149
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 147119
+                          "lo": 267149
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 1
+                          "lo": 7
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.34.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.34.json
index 6ea372ca..9517cfaa 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.34.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.34.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 408682
+                    "lo": 677313
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 408682
+                    "lo": 677313
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 408682
+                        "lo": 677313
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 10
+                    "lo": 1
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 408782
+                                  "lo": 677413
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 408782
+                            "lo": 677413
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 408782
+                          "lo": 677413
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 10
+                          "lo": 1
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.35.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.35.json
index 3f3ef5e3..f60528a7 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.35.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.35.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 33178
+                    "lo": 760345
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 33178
+                    "lo": 760345
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 33178
+                        "lo": 760345
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 3
+                    "lo": 1
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 33278
+                                  "lo": 760445
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 33278
+                            "lo": 760445
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 33278
+                          "lo": 760445
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 3
+                          "lo": 1
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.36.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.36.json
index f409ff7b..7997814f 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.36.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.36.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 478087
+                    "lo": 977014
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 478087
+                    "lo": 977014
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 478087
+                        "lo": 977014
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 7
+                    "lo": 6
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 478187
+                                  "lo": 977114
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 478187
+                            "lo": 977114
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 478187
+                          "lo": 977114
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 7
+                          "lo": 6
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.37.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.37.json
index 6930206a..e7193218 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.37.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.37.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 769269
+                    "lo": 637200
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 769269
+                    "lo": 637200
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 769269
+                        "lo": 637200
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 2
+                    "lo": 7
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 769369
+                                  "lo": 637300
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 769369
+                            "lo": 637300
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 769369
+                          "lo": 637300
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 2
+                          "lo": 7
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.38.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.38.json
index f3ef86dd..20328cf9 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.38.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.38.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 890359
+                    "lo": 40552
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 890359
+                    "lo": 40552
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 890359
+                        "lo": 40552
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 10
+                    "lo": 8
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 890459
+                                  "lo": 40652
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 890459
+                            "lo": 40652
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 890459
+                          "lo": 40652
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 10
+                          "lo": 8
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.39.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.39.json
index 38f26814..f6a44d84 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.39.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.39.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 111008
+                    "lo": 290197
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 111008
+                    "lo": 290197
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 111008
+                        "lo": 290197
                       }
                     }
                   ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 111108
+                                  "lo": 290297
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 111108
+                            "lo": 290297
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 111108
+                          "lo": 290297
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.4.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.4.json
index ac728bbe..6c7e2b80 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.4.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.4.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 981228
+                    "lo": 568207
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 981228
+                    "lo": 568207
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 981228
+                        "lo": 568207
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 6
+                    "lo": 7
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 981328
+                                  "lo": 568307
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 981328
+                            "lo": 568307
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 981328
+                          "lo": 568307
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 6
+                          "lo": 7
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.40.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.40.json
index 6e3ea30d..6690c5fc 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.40.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.40.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 28570
+                    "lo": 944858
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 28570
+                    "lo": 944858
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 28570
+                        "lo": 944858
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 2
+                    "lo": 10
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 28670
+                                  "lo": 944958
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 28670
+                            "lo": 944958
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 28670
+                          "lo": 944958
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 2
+                          "lo": 10
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.41.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.41.json
index 6960d35b..40504ae9 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.41.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.41.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 297568
+                    "lo": 218555
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 297568
+                    "lo": 218555
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 297568
+                        "lo": 218555
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 4
+                    "lo": 8
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 297668
+                                  "lo": 218655
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 297668
+                            "lo": 218655
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 297668
+                          "lo": 218655
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 4
+                          "lo": 8
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.42.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.42.json
index 07d6942b..dcad0dc8 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.42.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.42.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 967190
+                    "lo": 262009
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 967190
+                    "lo": 262009
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 967190
+                        "lo": 262009
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 4
+                    "lo": 5
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 967290
+                                  "lo": 262109
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 967290
+                            "lo": 262109
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 967290
+                          "lo": 262109
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 4
+                          "lo": 5
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.43.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.43.json
index cd5c7da2..65955511 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.43.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.43.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 280518
+                    "lo": 922151
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 280518
+                    "lo": 922151
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 280518
+                        "lo": 922151
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 6
+                    "lo": 2
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 280618
+                                  "lo": 922251
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 280618
+                            "lo": 922251
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 280618
+                          "lo": 922251
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 6
+                          "lo": 2
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.44.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.44.json
index 08509a2a..0ff3e937 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.44.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.44.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 554214
+                    "lo": 644044
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 554214
+                    "lo": 644044
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 554214
+                        "lo": 644044
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 9
+                    "lo": 6
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 554314
+                                  "lo": 644144
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 554314
+                            "lo": 644144
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 554314
+                          "lo": 644144
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 9
+                          "lo": 6
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.45.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.45.json
index e2abab35..977004f6 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.45.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.45.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 176956
+                    "lo": 647446
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 176956
+                    "lo": 647446
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 176956
+                        "lo": 647446
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 8
+                    "lo": 2
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 177056
+                                  "lo": 647546
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 177056
+                            "lo": 647546
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 177056
+                          "lo": 647546
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 8
+                          "lo": 2
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.46.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.46.json
index dd844de1..7ac2cd54 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.46.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.46.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 286381
+                    "lo": 205621
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 286381
+                    "lo": 205621
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 286381
+                        "lo": 205621
                       }
                     }
                   ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 286481
+                                  "lo": 205721
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 286481
+                            "lo": 205721
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 286481
+                          "lo": 205721
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.47.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.47.json
index 48964dfa..ea32d02f 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.47.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.47.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 271251
+                    "lo": 432530
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 271251
+                    "lo": 432530
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 271251
+                        "lo": 432530
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 4
+                    "lo": 2
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 271351
+                                  "lo": 432630
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 271351
+                            "lo": 432630
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 271351
+                          "lo": 432630
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 4
+                          "lo": 2
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.48.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.48.json
index 95c9df83..a83d8768 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.48.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.48.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 976917
+                    "lo": 704425
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 976917
+                    "lo": 704425
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 976917
+                        "lo": 704425
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 7
+                    "lo": 6
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 977017
+                                  "lo": 704525
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 977017
+                            "lo": 704525
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 977017
+                          "lo": 704525
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 7
+                          "lo": 6
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.49.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.49.json
index c000e640..6d53bc4b 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.49.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.49.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 212123
+                    "lo": 354567
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 212123
+                    "lo": 354567
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 212123
+                        "lo": 354567
                       }
                     }
                   ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 212223
+                                  "lo": 354667
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 212223
+                            "lo": 354667
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 212223
+                          "lo": 354667
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.5.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.5.json
index e18e9dbb..e1cb44b6 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.5.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.5.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 27215
+                    "lo": 236801
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 27215
+                    "lo": 236801
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 27215
+                        "lo": 236801
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 7
+                    "lo": 1
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 27315
+                                  "lo": 236901
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 27315
+                            "lo": 236901
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 27315
+                          "lo": 236901
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 7
+                          "lo": 1
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.50.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.50.json
index b190b47e..34a19e1c 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.50.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.50.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 491267
+                    "lo": 695935
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 491267
+                    "lo": 695935
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 491267
+                        "lo": 695935
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 1
+                    "lo": 6
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 491367
+                                  "lo": 696035
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 491367
+                            "lo": 696035
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 491367
+                          "lo": 696035
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 1
+                          "lo": 6
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.51.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.51.json
index 74053bf0..625e368f 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.51.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.51.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 302506
+                    "lo": 847404
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 302506
+                    "lo": 847404
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 302506
+                        "lo": 847404
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 8
+                    "lo": 1
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 302606
+                                  "lo": 847504
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 302606
+                            "lo": 847504
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 302606
+                          "lo": 847504
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 8
+                          "lo": 1
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.52.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.52.json
index 68585c9f..e1ae56ce 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.52.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.52.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 884220
+                    "lo": 243374
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 884220
+                    "lo": 243374
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 884220
+                        "lo": 243374
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 3
+                    "lo": 5
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 884320
+                                  "lo": 243474
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 884320
+                            "lo": 243474
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 884320
+                          "lo": 243474
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 3
+                          "lo": 5
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.53.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.53.json
index fd0df2ef..e7343615 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.53.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.53.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 304415
+                    "lo": 281387
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 304415
+                    "lo": 281387
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 304415
+                        "lo": 281387
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 2
+                    "lo": 7
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 304515
+                                  "lo": 281487
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 304515
+                            "lo": 281487
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 304515
+                          "lo": 281487
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 2
+                          "lo": 7
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.54.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.54.json
index d1de4420..dc0b85bb 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.54.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.54.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 207601
+                    "lo": 854222
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 207601
+                    "lo": 854222
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 207601
+                        "lo": 854222
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 4
+                    "lo": 10
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 207701
+                                  "lo": 854322
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 207701
+                            "lo": 854322
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 207701
+                          "lo": 854322
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 4
+                          "lo": 10
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.55.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.55.json
index 81983333..59ef03d9 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.55.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.55.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 284165
+                    "lo": 877007
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 284165
+                    "lo": 877007
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 284165
+                        "lo": 877007
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 5
+                    "lo": 3
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 284265
+                                  "lo": 877107
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 284265
+                            "lo": 877107
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 284265
+                          "lo": 877107
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 5
+                          "lo": 3
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.56.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.56.json
index b9eb45b0..583a9ad7 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.56.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.56.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 385058
+                    "lo": 758661
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 385058
+                    "lo": 758661
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 385058
+                        "lo": 758661
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 9
+                    "lo": 10
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 385158
+                                  "lo": 758761
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 385158
+                            "lo": 758761
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 385158
+                          "lo": 758761
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 9
+                          "lo": 10
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.57.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.57.json
index 2462b0ae..60c80a18 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.57.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.57.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 570097
+                    "lo": 452961
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 570097
+                    "lo": 452961
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 570097
+                        "lo": 452961
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 1
+                    "lo": 7
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 570197
+                                  "lo": 453061
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 570197
+                            "lo": 453061
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 570197
+                          "lo": 453061
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 1
+                          "lo": 7
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.58.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.58.json
index d014816b..5a8ed0a1 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.58.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.58.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 615456
+                    "lo": 261381
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 615456
+                    "lo": 261381
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 615456
+                        "lo": 261381
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 4
+                    "lo": 2
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 615556
+                                  "lo": 261481
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 615556
+                            "lo": 261481
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 615556
+                          "lo": 261481
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 4
+                          "lo": 2
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.59.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.59.json
index d066b079..cbfcebfc 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.59.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.59.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 321386
+                    "lo": 378080
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 321386
+                    "lo": 378080
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 321386
+                        "lo": 378080
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 10
+                    "lo": 2
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 321486
+                                  "lo": 378180
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 321486
+                            "lo": 378180
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 321486
+                          "lo": 378180
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 10
+                          "lo": 2
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.6.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.6.json
index 4ac37480..ef080f64 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.6.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.6.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 81845
+                    "lo": 906842
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 81845
+                    "lo": 906842
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 81845
+                        "lo": 906842
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 10
+                    "lo": 8
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 81945
+                                  "lo": 906942
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 81945
+                            "lo": 906942
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 81945
+                          "lo": 906942
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 10
+                          "lo": 8
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.60.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.60.json
index d6e72a91..30736116 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.60.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.60.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 581985
+                    "lo": 988022
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 581985
+                    "lo": 988022
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 581985
+                        "lo": 988022
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 3
+                    "lo": 6
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 582085
+                                  "lo": 988122
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 582085
+                            "lo": 988122
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 582085
+                          "lo": 988122
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 3
+                          "lo": 6
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.61.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.61.json
index 77d62c76..4006bc37 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.61.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.61.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 184256
+                    "lo": 191387
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 184256
+                    "lo": 191387
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 184256
+                        "lo": 191387
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 5
+                    "lo": 9
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 184356
+                                  "lo": 191487
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 184356
+                            "lo": 191487
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 184356
+                          "lo": 191487
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 5
+                          "lo": 9
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.62.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.62.json
index 30025671..f657bf39 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.62.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.62.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 122029
+                    "lo": 686139
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 122029
+                    "lo": 686139
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 122029
+                        "lo": 686139
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 6
+                    "lo": 1
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 122129
+                                  "lo": 686239
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 122129
+                            "lo": 686239
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 122129
+                          "lo": 686239
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 6
+                          "lo": 1
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.63.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.63.json
index cfaa2507..f1976df4 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.63.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.63.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 964012
+                    "lo": 93370
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 964012
+                    "lo": 93370
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 964012
+                        "lo": 93370
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 9
+                    "lo": 1
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 964112
+                                  "lo": 93470
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 964112
+                            "lo": 93470
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 964112
+                          "lo": 93470
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 9
+                          "lo": 1
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.64.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.64.json
index 2bf69ea5..55b3afcd 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.64.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.64.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 565375
+                    "lo": 369362
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 565375
+                    "lo": 369362
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 565375
+                        "lo": 369362
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 6
+                    "lo": 4
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 565475
+                                  "lo": 369462
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 565475
+                            "lo": 369462
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 565475
+                          "lo": 369462
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 6
+                          "lo": 4
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.65.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.65.json
index 2076bf38..c97ece38 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.65.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.65.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 891385
+                    "lo": 737451
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 891385
+                    "lo": 737451
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 891385
+                        "lo": 737451
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 6
+                    "lo": 10
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 891485
+                                  "lo": 737551
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 891485
+                            "lo": 737551
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 891485
+                          "lo": 737551
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 6
+                          "lo": 10
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.66.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.66.json
index 6fdf5fce..39e1d2f2 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.66.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.66.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 926272
+                    "lo": 196398
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 926272
+                    "lo": 196398
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 926272
+                        "lo": 196398
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 4
+                    "lo": 5
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 926372
+                                  "lo": 196498
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 926372
+                            "lo": 196498
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 926372
+                          "lo": 196498
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 4
+                          "lo": 5
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.67.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.67.json
index 4dd04cb4..d52adb64 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.67.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.67.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 802859
+                    "lo": 231315
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 802859
+                    "lo": 231315
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 802859
+                        "lo": 231315
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 8
+                    "lo": 10
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 802959
+                                  "lo": 231415
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 802959
+                            "lo": 231415
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 802959
+                          "lo": 231415
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 8
+                          "lo": 10
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.68.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.68.json
index 4004f60b..addacda3 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.68.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.68.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 766247
+                    "lo": 616169
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 766247
+                    "lo": 616169
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 766247
+                        "lo": 616169
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 3
+                    "lo": 5
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 766347
+                                  "lo": 616269
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 766347
+                            "lo": 616269
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 766347
+                          "lo": 616269
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 3
+                          "lo": 5
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.69.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.69.json
index b6348f24..79e82818 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.69.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.69.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 486503
+                    "lo": 708566
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 486503
+                    "lo": 708566
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 486503
+                        "lo": 708566
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 2
+                    "lo": 1
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 486603
+                                  "lo": 708666
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 486603
+                            "lo": 708666
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 486603
+                          "lo": 708666
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 2
+                          "lo": 1
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.7.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.7.json
index 878227de..7d37da7b 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.7.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.7.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 50743
+                    "lo": 744989
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 50743
+                    "lo": 744989
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 50743
+                        "lo": 744989
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 4
+                    "lo": 8
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 50843
+                                  "lo": 745089
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 50843
+                            "lo": 745089
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 50843
+                          "lo": 745089
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 4
+                          "lo": 8
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.70.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.70.json
index 5e5255ab..aa3b9088 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.70.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.70.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 820094
+                    "lo": 483545
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 820094
+                    "lo": 483545
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 820094
+                        "lo": 483545
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 8
+                    "lo": 9
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 820194
+                                  "lo": 483645
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 820194
+                            "lo": 483645
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 820194
+                          "lo": 483645
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 8
+                          "lo": 9
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.71.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.71.json
index 7736223e..5a3d139d 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.71.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.71.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 1593
+                    "lo": 624633
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 1593
+                    "lo": 624633
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 1593
+                        "lo": 624633
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 5
+                    "lo": 9
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 1693
+                                  "lo": 624733
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 1693
+                            "lo": 624733
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 1693
+                          "lo": 624733
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 5
+                          "lo": 9
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.72.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.72.json
index 1881c72b..f58f229f 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.72.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.72.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 879117
+                    "lo": 93346
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 879117
+                    "lo": 93346
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 879117
+                        "lo": 93346
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 4
+                    "lo": 6
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 879217
+                                  "lo": 93446
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 879217
+                            "lo": 93446
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 879217
+                          "lo": 93446
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 4
+                          "lo": 6
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.73.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.73.json
index 73d3986e..e3dafa0c 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.73.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.73.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 315572
+                    "lo": 474207
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 315572
+                    "lo": 474207
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 315572
+                        "lo": 474207
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 9
+                    "lo": 6
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 315672
+                                  "lo": 474307
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 315672
+                            "lo": 474307
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 315672
+                          "lo": 474307
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 9
+                          "lo": 6
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.74.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.74.json
index ee857f9b..ee326ed0 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.74.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.74.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 735357
+                    "lo": 552543
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 735357
+                    "lo": 552543
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 735357
+                        "lo": 552543
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 1
+                    "lo": 3
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 735457
+                                  "lo": 552643
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 735457
+                            "lo": 552643
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 735457
+                          "lo": 552643
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 1
+                          "lo": 3
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.75.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.75.json
index 3039c138..8434a138 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.75.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.75.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 915809
+                    "lo": 65272
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 915809
+                    "lo": 65272
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 915809
+                        "lo": 65272
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 7
+                    "lo": 5
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 915909
+                                  "lo": 65372
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 915909
+                            "lo": 65372
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 915909
+                          "lo": 65372
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 7
+                          "lo": 5
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.76.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.76.json
index 0a775708..ed741591 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.76.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.76.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 937307
+                    "lo": 514311
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 937307
+                    "lo": 514311
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 937307
+                        "lo": 514311
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 1
+                    "lo": 5
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 937407
+                                  "lo": 514411
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 937407
+                            "lo": 514411
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 937407
+                          "lo": 514411
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 1
+                          "lo": 5
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.77.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.77.json
index e0675b1a..66d85dda 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.77.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.77.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 791148
+                    "lo": 903511
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 791148
+                    "lo": 903511
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 791148
+                        "lo": 903511
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 5
+                    "lo": 1
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 791248
+                                  "lo": 903611
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 791248
+                            "lo": 903611
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 791248
+                          "lo": 903611
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 5
+                          "lo": 1
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.78.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.78.json
index 6ca55112..ef1c3b2c 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.78.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.78.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 234683
+                    "lo": 785376
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 234683
+                    "lo": 785376
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 234683
+                        "lo": 785376
                       }
                     }
                   ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 234783
+                                  "lo": 785476
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 234783
+                            "lo": 785476
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 234783
+                          "lo": 785476
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.79.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.79.json
index 638703d7..d8390242 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.79.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.79.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 13841
+                    "lo": 267785
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 13841
+                    "lo": 267785
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 13841
+                        "lo": 267785
                       }
                     }
                   ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 13941
+                                  "lo": 267885
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 13941
+                            "lo": 267885
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 13941
+                          "lo": 267885
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.8.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.8.json
index 79fe606d..5ac363fa 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.8.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.8.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 84569
+                    "lo": 646595
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 84569
+                    "lo": 646595
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 84569
+                        "lo": 646595
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 8
+                    "lo": 4
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 84669
+                                  "lo": 646695
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 84669
+                            "lo": 646695
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 84669
+                          "lo": 646695
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 8
+                          "lo": 4
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.80.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.80.json
index 01651cbe..388d1542 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.80.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.80.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 646313
+                    "lo": 754954
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 646313
+                    "lo": 754954
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 646313
+                        "lo": 754954
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 2
+                    "lo": 9
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 646413
+                                  "lo": 755054
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 646413
+                            "lo": 755054
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 646413
+                          "lo": 755054
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 2
+                          "lo": 9
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.81.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.81.json
index eeecd566..d47f1360 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.81.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.81.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 533817
+                    "lo": 926259
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 533817
+                    "lo": 926259
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 533817
+                        "lo": 926259
                       }
                     }
                   ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 533917
+                                  "lo": 926359
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 533917
+                            "lo": 926359
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 533917
+                          "lo": 926359
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.82.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.82.json
index ae9d8ba7..c3578b5e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.82.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.82.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 25798
+                    "lo": 152373
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 25798
+                    "lo": 152373
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 25798
+                        "lo": 152373
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 6
+                    "lo": 8
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 25898
+                                  "lo": 152473
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 25898
+                            "lo": 152473
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 25898
+                          "lo": 152473
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 6
+                          "lo": 8
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.83.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.83.json
index 1c65148d..8aa208fa 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.83.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.83.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 79126
+                    "lo": 643715
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 79126
+                    "lo": 643715
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 79126
+                        "lo": 643715
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 5
+                    "lo": 7
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 79226
+                                  "lo": 643815
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 79226
+                            "lo": 643815
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 79226
+                          "lo": 643815
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 5
+                          "lo": 7
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.84.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.84.json
index 13172a16..7fb8e341 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.84.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.84.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 795675
+                    "lo": 282555
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 795675
+                    "lo": 282555
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 795675
+                        "lo": 282555
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 4
+                    "lo": 1
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 795775
+                                  "lo": 282655
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 795775
+                            "lo": 282655
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 795775
+                          "lo": 282655
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 4
+                          "lo": 1
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.85.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.85.json
index 902675c2..c03d0722 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.85.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.85.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 599957
+                    "lo": 203986
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 599957
+                    "lo": 203986
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 599957
+                        "lo": 203986
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 8
+                    "lo": 6
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 600057
+                                  "lo": 204086
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 600057
+                            "lo": 204086
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 600057
+                          "lo": 204086
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 8
+                          "lo": 6
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.86.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.86.json
index 37ff12dc..f22b1da5 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.86.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.86.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 921377
+                    "lo": 715749
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 921377
+                    "lo": 715749
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 921377
+                        "lo": 715749
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 1
+                    "lo": 2
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 921477
+                                  "lo": 715849
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 921477
+                            "lo": 715849
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 921477
+                          "lo": 715849
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 1
+                          "lo": 2
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.87.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.87.json
index 9de3d482..557faf72 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.87.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.87.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 520705
+                    "lo": 870744
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 520705
+                    "lo": 870744
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 520705
+                        "lo": 870744
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 9
+                    "lo": 5
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 520805
+                                  "lo": 870844
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 520805
+                            "lo": 870844
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 520805
+                          "lo": 870844
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 9
+                          "lo": 5
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.88.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.88.json
index 2ee47246..cbfc7914 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.88.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.88.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 342121
+                    "lo": 545759
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 342121
+                    "lo": 545759
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 342121
+                        "lo": 545759
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 8
+                    "lo": 5
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 342221
+                                  "lo": 545859
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 342221
+                            "lo": 545859
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 342221
+                          "lo": 545859
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 8
+                          "lo": 5
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.89.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.89.json
index 369b1231..728b6d8e 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.89.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.89.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 631725
+                    "lo": 990535
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 631725
+                    "lo": 990535
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 631725
+                        "lo": 990535
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 6
+                    "lo": 7
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 631825
+                                  "lo": 990635
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 631825
+                            "lo": 990635
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 631825
+                          "lo": 990635
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 6
+                          "lo": 7
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.9.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.9.json
index 6fbd581a..958ac4a7 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.9.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.9.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 17805
+                    "lo": 981309
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 17805
+                    "lo": 981309
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 17805
+                        "lo": 981309
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 9
+                    "lo": 5
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 17905
+                                  "lo": 981409
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 17905
+                            "lo": 981409
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 17905
+                          "lo": 981409
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 9
+                          "lo": 5
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.90.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.90.json
index 86eb2cb4..2dba38f5 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.90.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.90.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 51723
+                    "lo": 285215
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 51723
+                    "lo": 285215
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 51723
+                        "lo": 285215
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 6
+                    "lo": 3
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 51823
+                                  "lo": 285315
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 51823
+                            "lo": 285315
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 51823
+                          "lo": 285315
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 6
+                          "lo": 3
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.91.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.91.json
index e095566c..0ec97f1f 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.91.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.91.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 255571
+                    "lo": 547213
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 255571
+                    "lo": 547213
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 255571
+                        "lo": 547213
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 9
+                    "lo": 5
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 255671
+                                  "lo": 547313
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 255671
+                            "lo": 547313
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 255671
+                          "lo": 547313
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 9
+                          "lo": 5
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.92.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.92.json
index 429d5ab7..f9dd5229 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.92.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.92.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 825694
+                    "lo": 677695
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 825694
+                    "lo": 677695
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 825694
+                        "lo": 677695
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 5
+                    "lo": 9
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 825794
+                                  "lo": 677795
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 825794
+                            "lo": 677795
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 825794
+                          "lo": 677795
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 5
+                          "lo": 9
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.93.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.93.json
index d8d3b8f5..890cf333 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.93.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.93.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 435690
+                    "lo": 414621
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 435690
+                    "lo": 414621
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 435690
+                        "lo": 414621
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 4
+                    "lo": 3
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 435790
+                                  "lo": 414721
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 435790
+                            "lo": 414721
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 435790
+                          "lo": 414721
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 4
+                          "lo": 3
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.94.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.94.json
index 4b3d32bd..8f578050 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.94.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.94.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 384379
+                    "lo": 176498
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 384379
+                    "lo": 176498
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 384379
+                        "lo": 176498
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 6
+                    "lo": 2
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 384479
+                                  "lo": 176598
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 384479
+                            "lo": 176598
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 384479
+                          "lo": 176598
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 6
+                          "lo": 2
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.95.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.95.json
index e84f9449..38a02989 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.95.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.95.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 980216
+                    "lo": 500909
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 980216
+                    "lo": 500909
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 980216
+                        "lo": 500909
                       }
                     }
                   ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 980316
+                                  "lo": 501009
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 980316
+                            "lo": 501009
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 980316
+                          "lo": 501009
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.96.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.96.json
index 0e744905..e4f48508 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.96.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.96.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 686300
+                    "lo": 954468
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 686300
+                    "lo": 954468
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 686300
+                        "lo": 954468
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 6
+                    "lo": 5
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 686400
+                                  "lo": 954568
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 686400
+                            "lo": 954568
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 686400
+                          "lo": 954568
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 6
+                          "lo": 5
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.97.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.97.json
index cc64ecf4..2dc7bbd6 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.97.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.97.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 91724
+                    "lo": 212301
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 91724
+                    "lo": 212301
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 91724
+                        "lo": 212301
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 1
+                    "lo": 6
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 91824
+                                  "lo": 212401
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 91824
+                            "lo": 212401
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 91824
+                          "lo": 212401
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 1
+                          "lo": 6
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.98.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.98.json
index f2c916d1..70740cb0 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.98.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.98.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 736286
+                    "lo": 602052
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 736286
+                    "lo": 602052
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 736286
+                        "lo": 602052
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 1
+                    "lo": 4
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 736386
+                                  "lo": 602152
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 736386
+                            "lo": 602152
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 736386
+                          "lo": 602152
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 1
+                          "lo": 4
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.99.json b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.99.json
index 60c0b874..e82264a4 100644
--- a/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.99.json
+++ b/contracts/vault/test_snapshots/fuzz_math/fuzz_tiny_deposit_with_yield.99.json
@@ -114,7 +114,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 98143
+                    "lo": 396276
                   }
                 }
               ]
@@ -136,7 +136,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 98143
+                    "lo": 396276
                   }
                 }
               ]
@@ -158,7 +158,7 @@
                     {
                       "i128": {
                         "hi": 0,
-                        "lo": 98143
+                        "lo": 396276
                       }
                     }
                   ]
@@ -185,7 +185,7 @@
                 {
                   "i128": {
                     "hi": 0,
-                    "lo": 8
+                    "lo": 7
                   }
                 }
               ]
@@ -426,16 +426,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,7 +510,7 @@
                               "val": {
                                 "i128": {
                                   "hi": 0,
-                                  "lo": 98243
+                                  "lo": 396376
                                 }
                               }
                             },
@@ -547,7 +551,7 @@
                         "val": {
                           "i128": {
                             "hi": 0,
-                            "lo": 98243
+                            "lo": 396376
                           }
                         }
                       },
@@ -565,6 +569,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAITA4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
@@ -726,7 +748,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 98243
+                          "lo": 396376
                         }
                       }
                     },
@@ -872,7 +894,7 @@
                       "val": {
                         "i128": {
                           "hi": 0,
-                          "lo": 8
+                          "lo": 7
                         }
                       }
                     },
diff --git a/contracts/vault/test_snapshots/test/test_accrue_yield_increases_total_assets.1.json b/contracts/vault/test_snapshots/test/test_accrue_yield_increases_total_assets.1.json
index 91858bb8..0799a382 100644
--- a/contracts/vault/test_snapshots/test/test_accrue_yield_increases_total_assets.1.json
+++ b/contracts/vault/test_snapshots/test/test_accrue_yield_increases_total_assets.1.json
@@ -261,16 +261,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_add_shipment_duplicate_panics.1.json b/contracts/vault/test_snapshots/test/test_add_shipment_duplicate_panics.1.json
index 73e4f9b0..e2abc763 100644
--- a/contracts/vault/test_snapshots/test/test_add_shipment_duplicate_panics.1.json
+++ b/contracts/vault/test_snapshots/test/test_add_shipment_duplicate_panics.1.json
@@ -182,16 +182,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_add_shipment_stores_and_retrieves.1.json b/contracts/vault/test_snapshots/test/test_add_shipment_stores_and_retrieves.1.json
index 81e4ab58..c47ad08c 100644
--- a/contracts/vault/test_snapshots/test/test_add_shipment_stores_and_retrieves.1.json
+++ b/contracts/vault/test_snapshots/test/test_add_shipment_stores_and_retrieves.1.json
@@ -182,16 +182,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_add_shipments_are_stored_sorted.1.json b/contracts/vault/test_snapshots/test/test_add_shipments_are_stored_sorted.1.json
index 4eb8b868..e6995ac4 100644
--- a/contracts/vault/test_snapshots/test/test_add_shipments_are_stored_sorted.1.json
+++ b/contracts/vault/test_snapshots/test/test_add_shipments_are_stored_sorted.1.json
@@ -300,16 +300,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_benji_connector_reports_yield.1.json b/contracts/vault/test_snapshots/test/test_benji_connector_reports_yield.1.json
index ac9af79e..75817583 100644
--- a/contracts/vault/test_snapshots/test/test_benji_connector_reports_yield.1.json
+++ b/contracts/vault/test_snapshots/test/test_benji_connector_reports_yield.1.json
@@ -457,16 +457,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -663,6 +667,24 @@
                           }
                         }
                       },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 500
+                          }
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_configure_korean_strategy_stores_address.1.json b/contracts/vault/test_snapshots/test/test_configure_korean_strategy_stores_address.1.json
index 441ad7f7..f0db5694 100644
--- a/contracts/vault/test_snapshots/test/test_configure_korean_strategy_stores_address.1.json
+++ b/contracts/vault/test_snapshots/test/test_configure_korean_strategy_stores_address.1.json
@@ -175,16 +175,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_create_strategy_proposal_does_not_require_admin.1.json b/contracts/vault/test_snapshots/test/test_create_strategy_proposal_does_not_require_admin.1.json
index ffdb31e1..e78d0e31 100644
--- a/contracts/vault/test_snapshots/test/test_create_strategy_proposal_does_not_require_admin.1.json
+++ b/contracts/vault/test_snapshots/test/test_create_strategy_proposal_does_not_require_admin.1.json
@@ -144,16 +144,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_deposit_does_not_require_admin.1.json b/contracts/vault/test_snapshots/test/test_deposit_does_not_require_admin.1.json
index 457c02b9..1a9b4785 100644
--- a/contracts/vault/test_snapshots/test/test_deposit_does_not_require_admin.1.json
+++ b/contracts/vault/test_snapshots/test/test_deposit_does_not_require_admin.1.json
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -369,6 +373,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
diff --git a/contracts/vault/test_snapshots/test/test_deposit_first_user_one_to_one_shares.1.json b/contracts/vault/test_snapshots/test/test_deposit_first_user_one_to_one_shares.1.json
index 72aabab6..4ce7faa2 100644
--- a/contracts/vault/test_snapshots/test/test_deposit_first_user_one_to_one_shares.1.json
+++ b/contracts/vault/test_snapshots/test/test_deposit_first_user_one_to_one_shares.1.json
@@ -233,16 +233,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -372,6 +376,24 @@
                             "lo": 500
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 500
+                          }
+                        }
                       }
                     ]
                   }
diff --git a/contracts/vault/test_snapshots/test/test_deposit_negative_returns_invalid_amount_error.1.json b/contracts/vault/test_snapshots/test/test_deposit_negative_returns_invalid_amount_error.1.json
index aa856cdd..54deba22 100644
--- a/contracts/vault/test_snapshots/test/test_deposit_negative_returns_invalid_amount_error.1.json
+++ b/contracts/vault/test_snapshots/test/test_deposit_negative_returns_invalid_amount_error.1.json
@@ -123,16 +123,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_deposit_second_user_proportional_shares.1.json b/contracts/vault/test_snapshots/test/test_deposit_second_user_proportional_shares.1.json
index aa18781e..c7054aea 100644
--- a/contracts/vault/test_snapshots/test/test_deposit_second_user_proportional_shares.1.json
+++ b/contracts/vault/test_snapshots/test/test_deposit_second_user_proportional_shares.1.json
@@ -475,16 +475,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -632,6 +636,42 @@
                             "lo": 166
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
diff --git a/contracts/vault/test_snapshots/test/test_deposit_state_management.1.json b/contracts/vault/test_snapshots/test/test_deposit_state_management.1.json
index 06b0cec0..20a4404c 100644
--- a/contracts/vault/test_snapshots/test/test_deposit_state_management.1.json
+++ b/contracts/vault/test_snapshots/test/test_deposit_state_management.1.json
@@ -232,16 +232,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -371,6 +375,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
diff --git a/contracts/vault/test_snapshots/test/test_deposit_tiny_amount_after_large_yield_mints_zero_shares.1.json b/contracts/vault/test_snapshots/test/test_deposit_tiny_amount_after_large_yield_mints_zero_shares.1.json
index 7c26c627..817db60f 100644
--- a/contracts/vault/test_snapshots/test/test_deposit_tiny_amount_after_large_yield_mints_zero_shares.1.json
+++ b/contracts/vault/test_snapshots/test/test_deposit_tiny_amount_after_large_yield_mints_zero_shares.1.json
@@ -367,16 +367,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -506,6 +510,24 @@
                             "lo": 1
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 1
+                          }
+                        }
                       }
                     ]
                   }
diff --git a/contracts/vault/test_snapshots/test/test_governance_duplicate_vote_panics.1.json b/contracts/vault/test_snapshots/test/test_governance_duplicate_vote_panics.1.json
index b2f5a7f3..e11c23ec 100644
--- a/contracts/vault/test_snapshots/test/test_governance_duplicate_vote_panics.1.json
+++ b/contracts/vault/test_snapshots/test/test_governance_duplicate_vote_panics.1.json
@@ -209,16 +209,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_governance_execute_below_threshold_panics.1.json b/contracts/vault/test_snapshots/test/test_governance_execute_below_threshold_panics.1.json
index 49fa0ad0..b8a1993e 100644
--- a/contracts/vault/test_snapshots/test/test_governance_execute_below_threshold_panics.1.json
+++ b/contracts/vault/test_snapshots/test/test_governance_execute_below_threshold_panics.1.json
@@ -297,16 +297,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_governance_execute_rejected_panics.1.json b/contracts/vault/test_snapshots/test/test_governance_execute_rejected_panics.1.json
index ee337fcd..7710b03d 100644
--- a/contracts/vault/test_snapshots/test/test_governance_execute_rejected_panics.1.json
+++ b/contracts/vault/test_snapshots/test/test_governance_execute_rejected_panics.1.json
@@ -242,16 +242,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_governance_execute_twice_panics.1.json b/contracts/vault/test_snapshots/test/test_governance_execute_twice_panics.1.json
index c1eba837..62629233 100644
--- a/contracts/vault/test_snapshots/test/test_governance_execute_twice_panics.1.json
+++ b/contracts/vault/test_snapshots/test/test_governance_execute_twice_panics.1.json
@@ -243,16 +243,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_governance_full_happy_path.1.json b/contracts/vault/test_snapshots/test/test_governance_full_happy_path.1.json
index 4f4a3483..9cb76c50 100644
--- a/contracts/vault/test_snapshots/test/test_governance_full_happy_path.1.json
+++ b/contracts/vault/test_snapshots/test/test_governance_full_happy_path.1.json
@@ -296,16 +296,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_governance_multiple_proposals_independent.1.json b/contracts/vault/test_snapshots/test/test_governance_multiple_proposals_independent.1.json
index fe34ad4f..70a13e18 100644
--- a/contracts/vault/test_snapshots/test/test_governance_multiple_proposals_independent.1.json
+++ b/contracts/vault/test_snapshots/test/test_governance_multiple_proposals_independent.1.json
@@ -364,16 +364,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_governance_sets_benji_strategy.1.json b/contracts/vault/test_snapshots/test/test_governance_sets_benji_strategy.1.json
index aa856cdd..54deba22 100644
--- a/contracts/vault/test_snapshots/test/test_governance_sets_benji_strategy.1.json
+++ b/contracts/vault/test_snapshots/test/test_governance_sets_benji_strategy.1.json
@@ -123,16 +123,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_governance_vote_on_executed_proposal_panics.1.json b/contracts/vault/test_snapshots/test/test_governance_vote_on_executed_proposal_panics.1.json
index 26d70a97..fda4ed59 100644
--- a/contracts/vault/test_snapshots/test/test_governance_vote_on_executed_proposal_panics.1.json
+++ b/contracts/vault/test_snapshots/test/test_governance_vote_on_executed_proposal_panics.1.json
@@ -243,16 +243,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_governance_zero_weight_panics.1.json b/contracts/vault/test_snapshots/test/test_governance_zero_weight_panics.1.json
index d2f561d7..d494ad75 100644
--- a/contracts/vault/test_snapshots/test/test_governance_zero_weight_panics.1.json
+++ b/contracts/vault/test_snapshots/test/test_governance_zero_weight_panics.1.json
@@ -178,16 +178,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_initialize_double_init_panics.1.json b/contracts/vault/test_snapshots/test/test_initialize_double_init_panics.1.json
index e341b9e2..1e2b5e10 100644
--- a/contracts/vault/test_snapshots/test/test_initialize_double_init_panics.1.json
+++ b/contracts/vault/test_snapshots/test/test_initialize_double_init_panics.1.json
@@ -123,16 +123,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_invariant_full_exit_zeroes_all_accounting.1.json b/contracts/vault/test_snapshots/test/test_invariant_full_exit_zeroes_all_accounting.1.json
index eb2fecca..26be742f 100644
--- a/contracts/vault/test_snapshots/test/test_invariant_full_exit_zeroes_all_accounting.1.json
+++ b/contracts/vault/test_snapshots/test/test_invariant_full_exit_zeroes_all_accounting.1.json
@@ -529,16 +529,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -686,6 +690,42 @@
                             "lo": 0
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 0
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 0
+                          }
+                        }
                       }
                     ]
                   }
diff --git a/contracts/vault/test_snapshots/test/test_invariant_share_asset_round_trip.1.json b/contracts/vault/test_snapshots/test/test_invariant_share_asset_round_trip.1.json
index 8dbfd36a..8888b49f 100644
--- a/contracts/vault/test_snapshots/test/test_invariant_share_asset_round_trip.1.json
+++ b/contracts/vault/test_snapshots/test/test_invariant_share_asset_round_trip.1.json
@@ -368,16 +368,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -507,6 +511,24 @@
                             "lo": 1000
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 1000
+                          }
+                        }
                       }
                     ]
                   }
diff --git a/contracts/vault/test_snapshots/test/test_invariant_share_price_consistent_after_multi_user_sequence.1.json b/contracts/vault/test_snapshots/test/test_invariant_share_price_consistent_after_multi_user_sequence.1.json
index 26174d7b..20397c92 100644
--- a/contracts/vault/test_snapshots/test/test_invariant_share_price_consistent_after_multi_user_sequence.1.json
+++ b/contracts/vault/test_snapshots/test/test_invariant_share_price_consistent_after_multi_user_sequence.1.json
@@ -585,16 +585,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -760,6 +764,60 @@
                             "lo": 1136
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 500
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 300
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLZM"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 400
+                          }
+                        }
                       }
                     ]
                   }
diff --git a/contracts/vault/test_snapshots/test/test_invariant_total_shares_equals_sum_of_balances.1.json b/contracts/vault/test_snapshots/test/test_invariant_total_shares_equals_sum_of_balances.1.json
index ae8431f5..062eb6f5 100644
--- a/contracts/vault/test_snapshots/test/test_invariant_total_shares_equals_sum_of_balances.1.json
+++ b/contracts/vault/test_snapshots/test/test_invariant_total_shares_equals_sum_of_balances.1.json
@@ -584,16 +584,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -759,6 +763,60 @@
                             "lo": 875
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 400
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 300
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLZM"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 200
+                          }
+                        }
                       }
                     ]
                   }
diff --git a/contracts/vault/test_snapshots/test/test_invariant_yield_accrual_never_changes_share_count.1.json b/contracts/vault/test_snapshots/test/test_invariant_yield_accrual_never_changes_share_count.1.json
index b05238c0..786408e8 100644
--- a/contracts/vault/test_snapshots/test/test_invariant_yield_accrual_never_changes_share_count.1.json
+++ b/contracts/vault/test_snapshots/test/test_invariant_yield_accrual_never_changes_share_count.1.json
@@ -527,16 +527,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -666,6 +670,24 @@
                             "lo": 500
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 500
+                          }
+                        }
                       }
                     ]
                   }
diff --git a/contracts/vault/test_snapshots/test/test_multiple_deposits_atomic_state_updates.1.json b/contracts/vault/test_snapshots/test/test_multiple_deposits_atomic_state_updates.1.json
index 087b90e3..59c3f1d9 100644
--- a/contracts/vault/test_snapshots/test/test_multiple_deposits_atomic_state_updates.1.json
+++ b/contracts/vault/test_snapshots/test/test_multiple_deposits_atomic_state_updates.1.json
@@ -340,16 +340,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -497,6 +501,42 @@
                             "lo": 200
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
diff --git a/contracts/vault/test_snapshots/test/test_report_benji_yield_before_strategy_configured_panics.1.json b/contracts/vault/test_snapshots/test/test_report_benji_yield_before_strategy_configured_panics.1.json
index aa856cdd..54deba22 100644
--- a/contracts/vault/test_snapshots/test/test_report_benji_yield_before_strategy_configured_panics.1.json
+++ b/contracts/vault/test_snapshots/test/test_report_benji_yield_before_strategy_configured_panics.1.json
@@ -123,16 +123,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_report_benji_yield_rejects_unauthorized_strategy.1.json b/contracts/vault/test_snapshots/test/test_report_benji_yield_rejects_unauthorized_strategy.1.json
index 26d70a97..fda4ed59 100644
--- a/contracts/vault/test_snapshots/test/test_report_benji_yield_rejects_unauthorized_strategy.1.json
+++ b/contracts/vault/test_snapshots/test/test_report_benji_yield_rejects_unauthorized_strategy.1.json
@@ -243,16 +243,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_report_benji_yield_wrong_strategy_panics.1.json b/contracts/vault/test_snapshots/test/test_report_benji_yield_wrong_strategy_panics.1.json
index 451cda15..3b05d0a7 100644
--- a/contracts/vault/test_snapshots/test/test_report_benji_yield_wrong_strategy_panics.1.json
+++ b/contracts/vault/test_snapshots/test/test_report_benji_yield_wrong_strategy_panics.1.json
@@ -356,16 +356,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_report_benji_yield_zero_amount_panics.1.json b/contracts/vault/test_snapshots/test/test_report_benji_yield_zero_amount_panics.1.json
index 578b8cc9..af955e67 100644
--- a/contracts/vault/test_snapshots/test/test_report_benji_yield_zero_amount_panics.1.json
+++ b/contracts/vault/test_snapshots/test/test_report_benji_yield_zero_amount_panics.1.json
@@ -298,16 +298,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_set_dao_threshold_happy_path.1.json b/contracts/vault/test_snapshots/test/test_set_dao_threshold_happy_path.1.json
index db576679..b1bfce83 100644
--- a/contracts/vault/test_snapshots/test/test_set_dao_threshold_happy_path.1.json
+++ b/contracts/vault/test_snapshots/test/test_set_dao_threshold_happy_path.1.json
@@ -297,16 +297,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_set_dao_threshold_negative_panics.1.json b/contracts/vault/test_snapshots/test/test_set_dao_threshold_negative_panics.1.json
index e341b9e2..1e2b5e10 100644
--- a/contracts/vault/test_snapshots/test/test_set_dao_threshold_negative_panics.1.json
+++ b/contracts/vault/test_snapshots/test/test_set_dao_threshold_negative_panics.1.json
@@ -123,16 +123,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_set_dao_threshold_zero_panics.1.json b/contracts/vault/test_snapshots/test/test_set_dao_threshold_zero_panics.1.json
index e341b9e2..1e2b5e10 100644
--- a/contracts/vault/test_snapshots/test/test_set_dao_threshold_zero_panics.1.json
+++ b/contracts/vault/test_snapshots/test/test_set_dao_threshold_zero_panics.1.json
@@ -123,16 +123,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_shipment_ids_by_status_zero_page_size_panics.1.json b/contracts/vault/test_snapshots/test/test_shipment_ids_by_status_zero_page_size_panics.1.json
index e341b9e2..1e2b5e10 100644
--- a/contracts/vault/test_snapshots/test/test_shipment_ids_by_status_zero_page_size_panics.1.json
+++ b/contracts/vault/test_snapshots/test/test_shipment_ids_by_status_zero_page_size_panics.1.json
@@ -123,16 +123,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_shipment_pagination_cursor_past_end_returns_empty.1.json b/contracts/vault/test_snapshots/test/test_shipment_pagination_cursor_past_end_returns_empty.1.json
index 3c1b8a30..4c8cab3b 100644
--- a/contracts/vault/test_snapshots/test/test_shipment_pagination_cursor_past_end_returns_empty.1.json
+++ b/contracts/vault/test_snapshots/test/test_shipment_pagination_cursor_past_end_returns_empty.1.json
@@ -241,16 +241,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_shipment_pagination_empty_status_returns_empty.1.json b/contracts/vault/test_snapshots/test/test_shipment_pagination_empty_status_returns_empty.1.json
index e341b9e2..1e2b5e10 100644
--- a/contracts/vault/test_snapshots/test/test_shipment_pagination_empty_status_returns_empty.1.json
+++ b/contracts/vault/test_snapshots/test/test_shipment_pagination_empty_status_returns_empty.1.json
@@ -123,16 +123,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_shipment_pagination_exhausts_completely.1.json b/contracts/vault/test_snapshots/test/test_shipment_pagination_exhausts_completely.1.json
index 913d7782..e296ad59 100644
--- a/contracts/vault/test_snapshots/test/test_shipment_pagination_exhausts_completely.1.json
+++ b/contracts/vault/test_snapshots/test/test_shipment_pagination_exhausts_completely.1.json
@@ -538,16 +538,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_shipment_pagination_max_page_size_capped.1.json b/contracts/vault/test_snapshots/test/test_shipment_pagination_max_page_size_capped.1.json
index 32f14e23..c7b1a9fe 100644
--- a/contracts/vault/test_snapshots/test/test_shipment_pagination_max_page_size_capped.1.json
+++ b/contracts/vault/test_snapshots/test/test_shipment_pagination_max_page_size_capped.1.json
@@ -3663,16 +3663,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_shipments_across_statuses_are_isolated.1.json b/contracts/vault/test_snapshots/test/test_shipments_across_statuses_are_isolated.1.json
index 3046b514..1c95fa01 100644
--- a/contracts/vault/test_snapshots/test/test_shipments_across_statuses_are_isolated.1.json
+++ b/contracts/vault/test_snapshots/test/test_shipments_across_statuses_are_isolated.1.json
@@ -362,16 +362,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_update_shipment_full_lifecycle_statuses.1.json b/contracts/vault/test_snapshots/test/test_update_shipment_full_lifecycle_statuses.1.json
index 1ba4f16f..77dd41d5 100644
--- a/contracts/vault/test_snapshots/test/test_update_shipment_full_lifecycle_statuses.1.json
+++ b/contracts/vault/test_snapshots/test/test_update_shipment_full_lifecycle_statuses.1.json
@@ -302,16 +302,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_update_shipment_status_moves_id_between_buckets.1.json b/contracts/vault/test_snapshots/test/test_update_shipment_status_moves_id_between_buckets.1.json
index 97679453..86146b5f 100644
--- a/contracts/vault/test_snapshots/test/test_update_shipment_status_moves_id_between_buckets.1.json
+++ b/contracts/vault/test_snapshots/test/test_update_shipment_status_moves_id_between_buckets.1.json
@@ -242,16 +242,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_update_shipment_status_same_status_is_noop.1.json b/contracts/vault/test_snapshots/test/test_update_shipment_status_same_status_is_noop.1.json
index 46f8667c..bb059581 100644
--- a/contracts/vault/test_snapshots/test/test_update_shipment_status_same_status_is_noop.1.json
+++ b/contracts/vault/test_snapshots/test/test_update_shipment_status_same_status_is_noop.1.json
@@ -241,16 +241,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_vault_flow_legacy.1.json b/contracts/vault/test_snapshots/test/test_vault_flow_legacy.1.json
index 5e1b9b33..da6bac3f 100644
--- a/contracts/vault/test_snapshots/test/test_vault_flow_legacy.1.json
+++ b/contracts/vault/test_snapshots/test/test_vault_flow_legacy.1.json
@@ -125,16 +125,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_vault_with_benji_strategy.1.json b/contracts/vault/test_snapshots/test/test_vault_with_benji_strategy.1.json
index fb5e93b6..68c82be9 100644
--- a/contracts/vault/test_snapshots/test/test_vault_with_benji_strategy.1.json
+++ b/contracts/vault/test_snapshots/test/test_vault_with_benji_strategy.1.json
@@ -71,6 +71,28 @@
     [],
     [],
     [],
+    [
+      [
+        "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
+        {
+          "function": {
+            "contract_fn": {
+              "contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4",
+              "function_name": "whitelist_strategy",
+              "args": [
+                {
+                  "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLZM"
+                },
+                {
+                  "bool": true
+                }
+              ]
+            }
+          },
+          "sub_invocations": []
+        }
+      ]
+    ],
     [
       [
         "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
@@ -412,7 +434,7 @@
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
             "key": {
               "ledger_key_nonce": {
-                "nonce": 4270020994084947596
+                "nonce": 2032731177588607455
               }
             },
             "durability": "temporary"
@@ -427,7 +449,7 @@
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
                 "key": {
                   "ledger_key_nonce": {
-                    "nonce": 4270020994084947596
+                    "nonce": 2032731177588607455
                   }
                 },
                 "durability": "temporary",
@@ -472,13 +494,46 @@
           6311999
         ]
       ],
+      [
+        {
+          "contract_data": {
+            "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
+            "key": {
+              "ledger_key_nonce": {
+                "nonce": 8370022561469687789
+              }
+            },
+            "durability": "temporary"
+          }
+        },
+        [
+          {
+            "last_modified_ledger_seq": 0,
+            "data": {
+              "contract_data": {
+                "ext": "v0",
+                "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
+                "key": {
+                  "ledger_key_nonce": {
+                    "nonce": 8370022561469687789
+                  }
+                },
+                "durability": "temporary",
+                "val": "void"
+              }
+            },
+            "ext": "v0"
+          },
+          6311999
+        ]
+      ],
       [
         {
           "contract_data": {
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
             "key": {
               "ledger_key_nonce": {
-                "nonce": 1194852393571756375
+                "nonce": 115220454072064130
               }
             },
             "durability": "temporary"
@@ -493,7 +548,7 @@
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
                 "key": {
                   "ledger_key_nonce": {
-                    "nonce": 1194852393571756375
+                    "nonce": 115220454072064130
                   }
                 },
                 "durability": "temporary",
@@ -511,7 +566,7 @@
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
             "key": {
               "ledger_key_nonce": {
-                "nonce": 2032731177588607455
+                "nonce": 4270020994084947596
               }
             },
             "durability": "temporary"
@@ -526,7 +581,7 @@
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4",
                 "key": {
                   "ledger_key_nonce": {
-                    "nonce": 2032731177588607455
+                    "nonce": 4270020994084947596
                   }
                 },
                 "durability": "temporary",
@@ -544,7 +599,7 @@
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M",
             "key": {
               "ledger_key_nonce": {
-                "nonce": 5541220902715666415
+                "nonce": 1194852393571756375
               }
             },
             "durability": "temporary"
@@ -559,7 +614,7 @@
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M",
                 "key": {
                   "ledger_key_nonce": {
-                    "nonce": 5541220902715666415
+                    "nonce": 1194852393571756375
                   }
                 },
                 "durability": "temporary",
@@ -577,7 +632,7 @@
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M",
             "key": {
               "ledger_key_nonce": {
-                "nonce": 5806905060045992000
+                "nonce": 5541220902715666415
               }
             },
             "durability": "temporary"
@@ -592,7 +647,7 @@
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M",
                 "key": {
                   "ledger_key_nonce": {
-                    "nonce": 5806905060045992000
+                    "nonce": 5541220902715666415
                   }
                 },
                 "durability": "temporary",
@@ -610,7 +665,7 @@
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M",
             "key": {
               "ledger_key_nonce": {
-                "nonce": 6277191135259896685
+                "nonce": 5806905060045992000
               }
             },
             "durability": "temporary"
@@ -625,7 +680,7 @@
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHK3M",
                 "key": {
                   "ledger_key_nonce": {
-                    "nonce": 6277191135259896685
+                    "nonce": 5806905060045992000
                   }
                 },
                 "durability": "temporary",
@@ -662,16 +717,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -772,6 +831,21 @@
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLZM"
                         }
                       },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "StrategyWhitelist"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLZM"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -813,6 +887,24 @@
                             "lo": 50
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFCT4"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 50
+                          }
+                        }
                       }
                     ]
                   }
@@ -830,7 +922,7 @@
             "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4",
             "key": {
               "ledger_key_nonce": {
-                "nonce": 8370022561469687789
+                "nonce": 6277191135259896685
               }
             },
             "durability": "temporary"
@@ -845,7 +937,7 @@
                 "contract": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4",
                 "key": {
                   "ledger_key_nonce": {
-                    "nonce": 8370022561469687789
+                    "nonce": 6277191135259896685
                   }
                 },
                 "durability": "temporary",
diff --git a/contracts/vault/test_snapshots/test/test_withdraw_does_not_require_admin.1.json b/contracts/vault/test_snapshots/test/test_withdraw_does_not_require_admin.1.json
index 356e1309..58f3aaae 100644
--- a/contracts/vault/test_snapshots/test/test_withdraw_does_not_require_admin.1.json
+++ b/contracts/vault/test_snapshots/test/test_withdraw_does_not_require_admin.1.json
@@ -255,16 +255,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -394,6 +398,24 @@
                             "lo": 50
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 50
+                          }
+                        }
                       }
                     ]
                   }
diff --git a/contracts/vault/test_snapshots/test/test_withdraw_exact_balance_drains_user_completely.1.json b/contracts/vault/test_snapshots/test/test_withdraw_exact_balance_drains_user_completely.1.json
index 61ec8b17..0e0c64e7 100644
--- a/contracts/vault/test_snapshots/test/test_withdraw_exact_balance_drains_user_completely.1.json
+++ b/contracts/vault/test_snapshots/test/test_withdraw_exact_balance_drains_user_completely.1.json
@@ -257,16 +257,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -396,6 +400,24 @@
                             "lo": 0
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 0
+                          }
+                        }
                       }
                     ]
                   }
diff --git a/contracts/vault/test_snapshots/test/test_withdraw_from_zero_balance_returns_error.1.json b/contracts/vault/test_snapshots/test/test_withdraw_from_zero_balance_returns_error.1.json
index aa856cdd..54deba22 100644
--- a/contracts/vault/test_snapshots/test/test_withdraw_from_zero_balance_returns_error.1.json
+++ b/contracts/vault/test_snapshots/test/test_withdraw_from_zero_balance_returns_error.1.json
@@ -123,16 +123,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
diff --git a/contracts/vault/test_snapshots/test/test_withdraw_happy_path_receives_correct_assets.1.json b/contracts/vault/test_snapshots/test/test_withdraw_happy_path_receives_correct_assets.1.json
index 975e79e8..fa391920 100644
--- a/contracts/vault/test_snapshots/test/test_withdraw_happy_path_receives_correct_assets.1.json
+++ b/contracts/vault/test_snapshots/test/test_withdraw_happy_path_receives_correct_assets.1.json
@@ -395,16 +395,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -534,6 +538,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 50
+                          }
+                        }
                       }
                     ]
                   }
diff --git a/contracts/vault/test_snapshots/test/test_withdraw_more_than_balance_returns_insufficient_shares.1.json b/contracts/vault/test_snapshots/test/test_withdraw_more_than_balance_returns_insufficient_shares.1.json
index 457c02b9..1a9b4785 100644
--- a/contracts/vault/test_snapshots/test/test_withdraw_more_than_balance_returns_insufficient_shares.1.json
+++ b/contracts/vault/test_snapshots/test/test_withdraw_more_than_balance_returns_insufficient_shares.1.json
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -369,6 +373,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
diff --git a/contracts/vault/test_snapshots/test/test_withdraw_negative_shares_returns_error.1.json b/contracts/vault/test_snapshots/test/test_withdraw_negative_shares_returns_error.1.json
index 457c02b9..1a9b4785 100644
--- a/contracts/vault/test_snapshots/test/test_withdraw_negative_shares_returns_error.1.json
+++ b/contracts/vault/test_snapshots/test/test_withdraw_negative_shares_returns_error.1.json
@@ -230,16 +230,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -369,6 +373,24 @@
                             "lo": 100
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 100
+                          }
+                        }
                       }
                     ]
                   }
diff --git a/contracts/vault/test_snapshots/test/test_withdraw_state_management.1.json b/contracts/vault/test_snapshots/test/test_withdraw_state_management.1.json
index dcc0c53c..9f18c5ec 100644
--- a/contracts/vault/test_snapshots/test/test_withdraw_state_management.1.json
+++ b/contracts/vault/test_snapshots/test/test_withdraw_state_management.1.json
@@ -256,16 +256,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -395,6 +399,24 @@
                             "lo": 50
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 50
+                          }
+                        }
                       }
                     ]
                   }
diff --git a/contracts/vault/test_snapshots/test/test_yield_accrual_maintains_state_consistency.1.json b/contracts/vault/test_snapshots/test/test_yield_accrual_maintains_state_consistency.1.json
index fb960034..2137ca08 100644
--- a/contracts/vault/test_snapshots/test/test_yield_accrual_maintains_state_consistency.1.json
+++ b/contracts/vault/test_snapshots/test/test_yield_accrual_maintains_state_consistency.1.json
@@ -371,16 +371,20 @@
                     "storage": [
                       {
                         "key": {
-                          "vec": [
-                            {
-                              "symbol": "Admin"
-                            }
-                          ]
+                          "u32": 0
                         },
                         "val": {
                           "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM"
                         }
                       },
+                      {
+                        "key": {
+                          "u32": 2
+                        },
+                        "val": {
+                          "bool": true
+                        }
+                      },
                       {
                         "key": {
                           "vec": [
@@ -510,6 +514,24 @@
                             "lo": 1000
                           }
                         }
+                      },
+                      {
+                        "key": {
+                          "vec": [
+                            {
+                              "symbol": "UserDeposit"
+                            },
+                            {
+                              "address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM"
+                            }
+                          ]
+                        },
+                        "val": {
+                          "i128": {
+                            "hi": 0,
+                            "lo": 1000
+                          }
+                        }
                       }
                     ]
                   }