Fixed Assign adapter and added setup adapter