Refactor ids
Added addUser