Some more changes for setting a new adapter