Reduce API calls - Fixes Issue #1