Updated binding & extract