Added more stuff to loader