small API changes. Decorator is removed.