Fixed issue #61
More database changes