Updated Mockingbird adapter