Refactored the hybrid export to be more similar to the standard export, closes #5