Be strict; support enterprise

Add yes and maybe functions to support enterprise applications.