SDK changes to optimize performance