Refactor and added list and user