Support spaces in DB
TODO