Adding support for checking local variables