Added initial keyword support