Security enhancement and util encapsulation