Some more entities and specs and guard