Fix: add user handle
Refactor: use constant