Initial commit with updated interface