More setup and database support