refactoring
fixed data config visibility
refactoring