Move ext loading and add comments