Improve Command Layer