Added some improvements concerning hidden functions