Added non-strict loading with slight refactor