Prototype implementation of extended mode (#1)