Rewrote pantry to correctly use adapters