Adding advanced analysis components