Moving towards common adapter pattern