NOJIRA Added extra attributes to