Progress on entity resource and links to entity resource