Convert to dict early