Changed some responsabilities, see the changelog