Moved custom options to own namespace