Simplify a lot of code, especially regarding adapters