Moved analysis tools to Utils