First attempt to support data types