Resolved TODOs and added adpaters