AbstractAdapter updates