Refactoring, remove expandAttributes method, allow more helper loaders