API Improvements and much more!