Analysis

API clean-up