Update to setup db script + more sample data