Add database and fix blueprints