Added custom adapter and clean up