Moving avatar delegate method to datasource