added ordering of match config
fixed persitence unit