Add possibility to skip DB creation