small changes in registry and decorator (still broken)