Added some implementation