code cleaned
create instance configuration fixed
generate configuration changed
code cleaned
merged with feature/ImportExport