Updated Adapter functionalities