Adding DB creation support