Included orika mapping
Create UserBuilder
Removed userId property
JS Refactor