Add inline expression and modify typer