Quick hack, need to add back removed things in an adapter