#41 Add support for userID