Updated adapter