More efficient API handling