Added some basic capabilities