preparing for keyword support