Fixed entities and updated dependencies