API 2: minor changes