Data types now handled correctly.