Added few fixes, for simplify start data loading