Small refactor to be able to use single user