No more factories needed for adapters
Better null-checks for validation