Added apapter class