Fix user ID parser
Improve general api module