Finishing Adapter CheckIn

Need improve Design