Added users + some refactorings.