Add option to skip DB