Support for Lexikon

Change-Id: I34044ab6a7c23f7313cf0cad01b2e4bd31f04410