Some structure, fixing specs to new Caliph