Changed the adapter methods