added db meta programming
fixed merge conflict