little improvents in API