Added optic adapters