Re-add Entity and update GrantType/ResponseType interface.