Changed output of fsa wrapper to dictionary