Improve quest and xml loader