More entities and SQL tables