Keyword additions and optimizations — 20141117