Add HACK and XXX