Added the keyword APIs and it's datamodel