Simplify and consolidate duplicate Entity code, add slug identifiers