Adapter: smartmad refactored