Updated Core and Database files to fit tutorial