API / some improvements