Simplification of module system: decorators removed