f0fb071 Re-add Entity and update GrantType/ResponseType interface.