Updates to analysis classes