Data transfer between components optimized, but not tested
Data transfer bugfix
Minor refactoring