Adding in reserved word handling