v2: Implemented Adapter pattern for future growth