Improved empty database methods