NOJIRA Updated loaders and added svg diagram