Major Bug Fix: made hibernate mapping to work.