Updated to work with storable module