Tweeks to reduce API usage