Changed some implementation details