improved const-ness in framework