Add reloading and a lookup function