Fix legacy code

For research reasons I have updated code which needs to be removed soon
to the new meta-metadata structure.

Signed-off-by: Konrad Reiche <konrad.reiche@gmail.com>