Fix namespace + add command service