Added configurations and DB fixes