Added API Generators