Updated to reflect API improvements