Added ajax loader and NameHelper