Added some missing features