Updated documentation and changed interfaces