More functions and extensions