Moved method to analysis plugin