Added greater functionality