Replaced mappings by decorators
Various smaller changes