Adapter updates and TODO added