Added some implementation details