Add keyword support