Added some new implementations