Refactor and added /user etc