Updated Database implementations and BoatAPI