Adapters and update system being worked on