Add API usage and basic polling machinery