Apis fixes and implementations