Fix for lifelines issue #85
Use entitymetadata