Added measurement functions