Added complex entities to the convertor. Fixes #2873