Restored original connections

Made the changes you requested @julian1, let me know if you're happy with that.

Schema needs to be dropped, and data bags updated.