Export refactoring and add simple Databinding