Added function implementations