Keyword additions and optimizations — 20140521