Finished-up HtDW and moving into compound data definitions