Rename and extended functionality