NEW: API Adaption for better Values