Added AuthHelper
Enhanced indexation