Added some more possible features