Refactored DataStatusHandler to a separate query and command handler