changes for raw handler