Changes for ePub support