Database & Configuration are modified to work