Adding some implementation