Updated methods to match updated interface