Some refactoring of @Load before redesign