Adding adapter pattern