2.2

refactorings and enhacements especially for attribution handling