Added ability to include adapter options