Updated for eZ Publish 5