Custom Adapter and other updates