First small refactory
Adding authentication builder