Move adapters to check to adapter file to avoid recompilation