Changes to databaseconnector and marketimpl