Modify to work with a standalone adapter