Better adapter support