Implementation adopted to the common API