Changed some bugs and added distributionsService