Commands offloaded and some minor improvements