Added extended functionality