Improved the initation and without data-directory loading