Make Accelerated API more strict