Added additional capabilities