more work on datahub manager