Started to add authentication