Support for analysis mode