API update - separates internal query handlers
2 files changed