Added extra features