Thought a little bit more and introduced refactoring with new PostProcessAssembly method.