Additional functions and modifications