Changed PasswordHelper to work with IoC/DI, fixes in Builder and
Mapper