Starting to add Commands support