Service Updated to Include Adapter