[ENHANCEMENT] API Skeleton in