Method for stub merging
Simplification of stubs
Improvements, todo for tommorow
Seems like all fixes works fine
Improvements to XML structure