Added custom adapters