Added additional features