Modified api class