Improved commands and optimized unbuild functionality