Flushing out internal data types more