Some changes in image core schema and data config. Removed ma2mp &
renamed ...mp... to ma in dataconfig line 220-221