HPSA-108 add table and some functions
HPSA-108 complete
.
Merging with HPSA-108