Worked a bit on the authentication module