Implemented new encapsulated options protocol