Refactored Adapters with cursor type