Tweaking API and Objects