Removes dep on mori and fixes addCommand