Changed to reflect the latest API