More command framework work