Added automatic keyword inclusion