Make require more generic