Added elements to NUOPC FSML