add other modules and re-work  setting datastore and message server hostname