Adapt generation of indicator and user objects