Add some database validation