Changed some method signatures, added some database methods