Added some upcoming features