Use new machete with better create-database