Moving APIs & Fixes