Added keyword and map functions