Added more versatility to adopter