Added optional file loader