More entities, and use Canary's working directory.