added a generic extended entity. We still need to have them separated for different paths.