API and user improvements