Added Adapter and Related Code