Extends features; improves API and documentation