Refactored adapter to encourage better compliance with standards