Keyword additions and optimizations — 20131218