DB enhancement

DB and performance enhancemed