Change APIs to merged one