Modified ignore list and fixed script mapper