More generic structure loading