General changes. Api clean-up.