Added additional content entities and related services