Changes for lexikon

Change-Id: I8e1cf0c7596a31c775bd3dd87ced55c5d60519ca