Merge shell module into core module
Merge database module into core module