Updated basic analysis functions