Changed authentication model - interim development stage