Remove Database from GiantCore.
Add Database as dependency.
Implement Database fixes for GiantCore.
Small change to pom.xml