GiovanH Hiveswap improvements and optimizations